From 74105dec94c29f2548c3bbc40e53bb28efd193a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Apr 2018 21:18:46 +0000 Subject: nwejm (9apr18) git-svn-id: svn://tug.org/texlive/trunk@47411 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/nwejm/README.md | 2 +- .../doc/latex/nwejm/addons/completion/nwejm.cwl | 20 +- .../doc/latex/nwejm/examples/article-in-dutch.pdf | Bin 188170 -> 188169 bytes .../latex/nwejm/examples/article-in-english.pdf | Bin 183995 -> 183993 bytes .../doc/latex/nwejm/examples/article-in-french.pdf | Bin 230817 -> 238973 bytes .../doc/latex/nwejm/examples/article-in-french.tex | 2 +- .../doc/latex/nwejm/examples/article-in-german.pdf | Bin 189320 -> 189411 bytes .../texmf-dist/doc/latex/nwejm/examples/issue.pdf | Bin 381222 -> 381764 bytes .../texmf-dist/doc/latex/nwejm/examples/sample.pdf | Bin 182148 -> 182211 bytes .../latex/nwejm/french/documentation/kpfonts.sty | 1678 ++++++++++++++++++++ .../doc/latex/nwejm/french/documentation/latexmkrc | 2 +- .../latex/nwejm/french/documentation/nwejm-fr.pdf | Bin 504197 -> 534939 bytes .../latex/nwejm/french/documentation/nwejm-fr.tex | 266 +++- .../source/latex/nwejm/nwejm-examples-template.dtx | 2 +- Master/texmf-dist/source/latex/nwejm/nwejm.dtx | 1044 +++++++++--- .../tex/latex/nwejm/images/logo-painleve.pdf | 317 ---- .../tex/latex/nwejm/images/logo-ul1-ufr-math.pdf | 249 --- Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl | 1 + .../texmf-dist/tex/latex/nwejm/nwejm-english.trsl | 1 + .../texmf-dist/tex/latex/nwejm/nwejm-french.trsl | 1 + .../texmf-dist/tex/latex/nwejm/nwejm-german.trsl | 1 + Master/texmf-dist/tex/latex/nwejm/nwejm.bbx | 2 +- Master/texmf-dist/tex/latex/nwejm/nwejm.cbx | 15 +- Master/texmf-dist/tex/latex/nwejm/nwejm.cls | 516 +++++- Master/texmf-dist/tex/latex/nwejm/nwejm.dbx | 34 + Master/texmf-dist/tex/latex/nwejm/nwejm.lbx | 2 +- Master/texmf-dist/tex/latex/nwejm/nwejmart.cls | 522 +++++- 27 files changed, 3590 insertions(+), 1087 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty delete mode 100644 Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf delete mode 100644 Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf create mode 100644 Master/texmf-dist/tex/latex/nwejm/nwejm.dbx (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/nwejm/README.md b/Master/texmf-dist/doc/latex/nwejm/README.md index 5f71163e188..f728b287408 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 ------- -Release 2017/02/14 v0.98d +2018/04/07 v0.98e Development ----------- diff --git a/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl b/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl index e44b98f5c0d..d4c7bd4fb52 100644 --- a/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl +++ b/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl @@ -7,36 +7,28 @@ #include:tex #include:xparse #include:l3keys2e -#include:l3sort #include:nag -#include:fontenc -#include:inputenc -#include:fontspec #include:graphicx #include:adjustbox -#include:draftwatermark -#include:xspace +#include:tcolorbox #include:csquotes -#include:biblatex #include:array #include:booktabs -#include:varioref #include:mathtools -#include:mathrsfs +#include:ntheorem +#include:rsfso #include:esvect #include:kpfonts #include:translations -#include:fmtcount -#include:geometry #include:babel +#include:varioref +#include:subcaption #include:tocvsec2 #include:etoc #include:microtype #include:datetime2 #include:enumitem -#include:pagegrid -#include:amsthm -#include:thmtools +#include:biblatex #include:hyperref #include:hypcap #include:bookmark 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 187f2895ab0..51c35acd0f4 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 7f5588ffe9d..af882fb4a8b 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 daf2647f934..3b31806dcf5 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-french.tex b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.tex index c19d89a0feb..79de854635f 100644 --- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.tex +++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.tex @@ -1,5 +1,5 @@ \documentclass[french]{nwejmart} -\usepackage{lipsum} % Devrait ne pas être utilisé dans un vrai article! +\usepackage{lipsum} % Devrait ne pas être utilisé dans un vrai article ! \addbibresource{sample.bib} % Exemple de fichier bibliographique simple \addbibresource{biblatex-examples.bib} % Exemple de fichier bibliographique sophistiqué % 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 509c7af895b..373d29e2353 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 169b3158ba7..647fb89b7de 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 6c2d99a061c..fc89bf0836a 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 new file mode 100644 index 00000000000..2e81411b34d --- /dev/null +++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty @@ -0,0 +1,1678 @@ +\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 Franois Ptiard +% + \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/latexmkrc b/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc index 3e6b294ce0d..9573be4e17f 100644 --- a/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc +++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc @@ -1,7 +1,7 @@ $pdf_mode = 1; $bibtex_use = 1; -$bibtex = 'biber %O %B'; +$bibtex = 'biber -U %O %B'; $makeindex = 'texindy -L french'; 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 4b716a77fca..7f83add137c 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 7c898063a93..a004e1facf5 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,7 +1,7 @@ \documentclass[french,nolocaltoc]{nwejmart} % -\DTMsavedate{release-date}{2017-02-14} -\newcommand{\releaseversion}{0.98d} +\DTMsavedate{release-date}{2018-04-07} +\newcommand{\releaseversion}{0.98e} % \usepackage{denisbdoc} \usepackage{tabulary} @@ -30,6 +30,7 @@ \newacronym{bap}{bap}{bounded approximation property} \newacronym{msc}{msc}{Mathematical Subject Classification} \newacronym{url}{url}{Uniform Resource Locator} +\newacronym{tdm}{tdm}{table des matières} % \newtheorem{article} \newtheorem[title=Fait,style=definition]{fact} @@ -104,7 +105,7 @@ classe a pour but : \begin{itemize} \item elle charge le \Package{inputenc}\footnote{% Il convient donc de \emph{ne pas} charger ce package : on se reportera - à la \vref{sec-canevas-de-fichier} pour un canevas de fichier source + à l'\vref{sec-canevas-de-fichier} pour un canevas de fichier source destiné à la \nwejm{} et notamment pour un préambule typique.% % } @@ -210,25 +211,67 @@ finale. \subsection{Titre, sous-titre} \label{sec-titre} -\begin{docCommand}[doc description=\mandatory]{title}{\oarg{titre court}\marg{titre}} - Cette commande définit le \meta{titre} de l'article qui apparaît : +\begin{docCommand}[doc new=2017-10-23]{title}{\oarg{titre alternatif {\normalfont\ttfamily\acrshort*{tdm}}}\oarg{titre alternatif entête}\marg{titre}} + Cette commande définit, pour l'article en cours : \begin{itemize} - \item en début d'article ; - \item en titre courant\footnote{En entête.} sur les pages paires ; - \item comme métadonnée \enquote{Titre} du fichier \textsc{pdf} correspondant ; - \item dans la table des matières du volume où sera publié l'article. + \item son \meta{titre} figurant en 1\iere{} page ; + \item son \emph{éventuel} \meta{titre alternatif + {\normalfont\ttfamily\acrshort*{tdm}}} figurant : + \begin{itemize} + \item dans le volume où l'article sera publié : + \begin{itemize} + \item en \gls{tdm} ; + \item en signet ; + \end{itemize} + \item dans le fichier \textsc{pdf} de l'article autonome, en métadonnée + \enquote{Titre} ; + \end{itemize} + \item son \emph{éventuel} \meta{titre alternatif entête} figurant en + entête\footnote{\Ie{} en titre courant.} sur les pages paires. \end{itemize} + L'usage précis de cette commande est synthétisé à la + \vref{tab-commande-title}. \end{docCommand} -\begin{docCommand}{subtitle}{\oarg{sous-titre court}\marg{sous-titre}} - Cette commande définit l'éventuel \meta{sous-titre} de l'article. Celui-ci - est automatiquement ajouté au titre. -\end{docCommand} +\begin{table}[htb] + \centering + \caption{Usage (des deux arguments optionnels) de la commande + \protect\refCom{title} } + \label{tab-commande-title} +\footnotesize% +\lstset{% + deletekeywords={title},deletekeywords={[3]title},% +} +\begin{tabular}{|l|c|c|c|} + \cline{2-4} + \multicolumn{1}{c|}{} & 1\iere{} page & \gls{tdm} & entête \\\hline + \lstinline+\title{+\meta{titre}\lstinline+}+ & \multicolumn{3}{c|}{\meta{titre}} \\\hline + \lstinline+\title[+\meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}}\lstinline+]{+\meta{titre}\lstinline+}+ & \meta{titre} & \multicolumn{2}{c|}{\meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}}} \\\hline + \lstinline+\title[][+\meta{alt. entête}\lstinline+]{+\meta{titre}\lstinline+}+ & \multicolumn{2}{c|}{\meta{titre}} & \meta{alt. entête} \\\hline + \lstinline+\title[+\meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}}\lstinline+][+\meta{alt. entête}\lstinline+]{+\meta{titre}\lstinline+}+ & \meta{titre} & \meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}} & \meta{alt. entête} \\\hline +\end{tabular} +\end{table} -Les commandes \refCom{title} et \refCom{subtitle} admettent un argument -optionnel permettant de spécifier un \meta{(sous-)titre court} de l'article qui -figure alors à la place du (sous-)titre \enquote{normal} en titre courant et -dans la table des matières. +\begin{docCommand}{subtitle}{\oarg{sous-titre alternatif {\normalfont\ttfamily\acrshort*{tdm}}}\marg{sous-titre}} + Cette commande définit \emph{éventuellement}, pour l'article en cours : + \begin{itemize} + \item son \meta{sous-titre} figurant en 1\iere{} page à la suite + du \meta{titre} ; + \item son \emph{éventuel} \meta{sous-titre alternatif + {\normalfont\ttfamily\acrshort*{tdm}}} figurant à la suite du + \meta{titre}\footnote{Ou éventuel \meta{titre alternatif + {\normalfont\ttfamily\acrshort*{tdm}}}.} : + \begin{itemize} + \item dans le volume où l'article sera publié : + \begin{itemize} + \item en \gls{tdm} ; + \item en signet ; + \end{itemize} + \item dans le fichier \textsc{pdf} de l'article autonome, en métadonnée + \enquote{Titre}. + \end{itemize} + \end{itemize} +\end{docCommand} \begin{bodycode} \title[Le Traité du calcul des probabilités]{Le Traité du calcul des @@ -269,6 +312,9 @@ suivante. En cas d'auteurs multiples, il suffit de (et il faut) recourir ou les majuscules)\footnote{Dans les articles en français, ce nom sera automatiquement composé en petites capitales.}. \end{enumerate} + + La métadonnée \enquote{Auteur} du \File{PDF} produit contient automatiquement + le ou les auteurs spécifiés. \end{dbwarning} La commande \refCom{author} admet un argument optionnel permettant de spécifier @@ -349,11 +395,11 @@ et \refKey{affiliationtagged} suivantes. Cette commande permet de spécifier les \meta{mots clés} de l'article sous la forme d'une liste séparée par des virgules. - La propriété \enquote{\texttt{pdfkeywords}} du \File{PDF} produit contient - automatiquement les \meta{mots clés} spécifiés. Dans le cas où ceux-ci - contiennent des caractères non admis en propriétés des fichiers \file{PDF} - (notamment des mathématiques), on spécifiera en argument optionnel une - \meta{variante des mots clés} ne contenant que des caractères autorisés. + 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. \end{docCommand} \begin{bodycode}[listing options={deletekeywords={[5]keywords}}] @@ -438,6 +484,50 @@ Le titre proprement dit de l'article, regroupant tous les éléments saisis à l commande \refCom{printbibliography} destinée à être utilisée en fin d'article. \end{dbremark} +\section{Commandes de structuration} + +La \nwejmauthorcl{} modifie la commande usuelle de structuration +\docAuxCommand{section} pour permettre d'en différencier le titre alternatif +figurant en \gls{tdm} de celui figurant en entête\footnote{On notera, de ce + point de vue, la similitude avec la commande \protect\refCom{title}.}. + +\begin{docCommand}[doc new=2017-10-23]{section}{\oarg{titre alternatif {\normalfont\ttfamily\acrshort*{tdm}}}\oarg{titre alternatif entête}\marg{titre}} + Cette commande définit, pour la section en cours : + \begin{itemize} + \item son \meta{titre} figurant au fil du texte ; + \item son \emph{éventuel} \meta{titre alternatif + {\normalfont\ttfamily\acrshort*{tdm}}} figurant, dans le volume où + l'article sera publié : + \begin{itemize} + \item en \gls{tdm} ; + \item en signet. + \end{itemize} + \item son \emph{éventuel} \meta{titre alternatif entête} figurant en + entête\footnote{\Ie{} en titre courant.} sur les pages impaires. + \end{itemize} + L'usage précis de cette commande est synthétisé à la + \vref{tab-commande-section}. +\end{docCommand} + +\begin{table}[htb] + \centering + \caption{Usage (des deux arguments optionnels) de la commande + \protect\refCom{section} } + \label{tab-commande-section} +\footnotesize% +\lstset{% + deletekeywords={section},deletekeywords={[3]section},% +} +\begin{tabular}{|l|c|c|c|} + \cline{2-4} + \multicolumn{1}{c|}{} & fil du texte & \gls{tdm} & entête \\\hline + \lstinline+\section{+\meta{titre}\lstinline+}+ & \multicolumn{3}{c|}{\meta{titre}} \\\hline + \lstinline+\section[+\meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}}\lstinline+]{+\meta{titre}\lstinline+}+ & \meta{titre} & \multicolumn{2}{c|}{\meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}}} \\\hline + \lstinline+\section[][+\meta{alt. entête}\lstinline+]{+\meta{titre}\lstinline+}+ & \multicolumn{2}{c|}{\meta{titre}} & \meta{alt. entête} \\\hline + \lstinline+\section[+\meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}}\lstinline+][+\meta{alt. entête}\lstinline+]{+\meta{titre}\lstinline+}+ & \meta{titre} & \meta{alt. {\normalfont\ttfamily\acrshort*{tdm}}} & \meta{alt. entête} \\\hline +\end{tabular} +\end{table} + \section{Bibliographie} \label{sec-bibliographie} @@ -568,7 +658,7 @@ La \nwejmauthorcl{} : \item \package*{mathtools} qui lui-même charge \package*{amsmath} (mais en l'étendant et en corrigeant certains de ses défauts), si bien que toutes les commandes de ces deux packages sont disponibles ; - \item \package*{mathrsfs} qui fournit de jolies lettres calligraphiques (via + \item \package*{rsfso} qui fournit de jolies lettres calligraphiques (via la commande \docAuxCommand{mathscr}) ; \end{itemize} \item redéfinit certaines commandes et en fournit quelques nouvelles, listées @@ -739,7 +829,7 @@ La \nwejmauthorcl{} : \subsubsection{Commandes prédéfinies} -La classe offre un certain nombre de commandes listées dans le \vref{com-paired} +La classe offre un certain nombre de commandes listées \vref{com-paired}, facilitant la saisie de paires de délimiteurs courants, par exemple pour les normes, les valeurs absolues, etc. @@ -977,7 +1067,7 @@ créer de nouveaux si besoin est (cf. commande \refCom{newtheorem}). \subsubsection{Environnements de type \enquote{théorème} prédéfinis} \label{sec:envir-de-type} -Le \vref{env-theorems} liste les théorèmes et objets analogues prédéfinis par la +La \vref{env-theorems} liste les théorèmes et objets analogues prédéfinis par la \nwejmauthorcl{} avec : \begin{description} \item[en colonne~1] le nom des environnements correspondants ; @@ -1006,7 +1096,7 @@ Le \vref{env-theorems} liste les théorèmes et objets analogues prédéfinis pa \end{table} \begin{dbremark}{\enquote{Théorèmes} non numérotés}{} - Chacun des environnements du \vref{env-theorems} admet une version étoilée + Chacun des environnements de la \vref{env-theorems} admet une version étoilée créant une version non numérotée de l'objet de type \enquote{théorème} correspondant. \end{dbremark} @@ -1034,7 +1124,7 @@ Le \vref{env-theorems} liste les théorèmes et objets analogues prédéfinis pa On remarque dans l'exemple précédent que les \enquote{théorèmes} ont des mises en forme variables. La \nwejmauthorcl{} fournit effectivement trois styles de \enquote{théorèmes}, \docValue{theorem}, \docValue{definition} et -\docValue{proof}, dont les caractéristiques sont indiquées au +\docValue{proof}, dont les caractéristiques sont indiquées à la \vref{env-theorems-styles}. \begin{table} @@ -1138,7 +1228,7 @@ hypothèse est introduite par la commande \docAuxCommand{item}. \begin{bodycode}[listing and text] \begin{axiom}\label{mon-axiome} - Chaque assertion suivante est admise. + Chacune des assertions suivantes est admise. \begin{assertions} \item\label{rare-cher} Tout ce qui est rare est cher. \item\label{cheval} Un cheval bon marché est rare. @@ -1223,9 +1313,9 @@ 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 \nwejmauthorcl\footnote{La - \vref{sec-packages-charges-ou-pas} liste ceux dont les fonctionnalités peuvent - être utiles aux auteurs.}. +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.}. \begin{dbwarning}{Liste des fonctionnalités des packages tiers non exhaustive}{} Cette liste est \emph{non exhaustive} : @@ -1272,52 +1362,52 @@ canevas de fichier source [...] % à \refCom{vref}. % \end{dbremark} -\subsection{\enquote{Équations} (non-)numérotées} -\label{sec:equat-non-numer} - -Le lecteur, rompu à la composition de formules de mathématiques, connaît -certainement le \Package*{amsmath} et les environnements qu'il fournit : -\begin{itemize} -\item |equation|, |align|, |gather|, |multline| et |flalign| qui numérotent - leur contenu ; -\item |equation*|, |align*|, |gather*|, |multline*| et |flalign*| qui \emph{ne} - numérotent \emph{pas} leur contenu ; -\end{itemize} -et utilise les premiers si (et seulement si, théoriquement) les contenus -correspondants font l'objet de références croisées. - -Avoir à choisir entre les versions numérotées ou pas présente au moins deux -inconvénients pour l'utilisateur : -\begin{enumerate} -\item cela l'oblige à se poser à chaque fois la question de la pertinence de la - numérotation de sa formule ; -\item son choix peut ultérieurement s'avérer caduc\footnote{Et donc nécessiter - de passer par exemple d'un environnement étoilé à un non-étoilé \aside*{donc - avec ajout d'un label}.}. -\end{enumerate} -Pour pallier cela, la \nwejmauthorcl{} charge automatiquement le -\Package{autonum} qui : -\begin{enumerate} -\item permet de ne recourir qu'aux environnements non-étoilés ; -\item assure automatiquement que les formules effectivement numérotées seront - celles, et seulement celles, s'avérant faire l'objet de références croisées au - sein du document. -\end{enumerate} - -\begin{bodycode}[listing and text] -L'\vref{euler-identity} mérite une référence croisée. -\begin{equation}\label{euler-identity} - \E[\I\pi]+1=0 -\end{equation} -C'est bien la seule ici. -\begin{equation}\label{not-interesting} - 0=0 -\end{equation} -Malheureusement. -\begin{equation} - 1=1 -\end{equation} -\end{bodycode} +% \subsection{\enquote{Équations} (non-)numérotées} +% \label{sec:equat-non-numer} +% +% Le lecteur, rompu à la composition de formules de mathématiques, connaît +% certainement le \Package*{amsmath} et les environnements qu'il fournit : +% \begin{itemize} +% \item |equation|, |align|, |gather|, |multline| et |flalign| qui numérotent +% leur contenu ; +% \item |equation*|, |align*|, |gather*|, |multline*| et |flalign*| qui \emph{ne} +% numérotent \emph{pas} leur contenu ; +% \end{itemize} +% et utilise les premiers si (et seulement si, théoriquement) les contenus +% correspondants font l'objet de références croisées. +% +% Avoir à choisir entre les versions numérotées ou pas présente au moins deux +% inconvénients pour l'utilisateur : +% \begin{enumerate} +% \item cela l'oblige à se poser à chaque fois la question de la pertinence de la +% numérotation de sa formule ; +% \item son choix peut ultérieurement s'avérer caduc\footnote{Et donc nécessiter +% de passer par exemple d'un environnement étoilé à un non-étoilé \aside*{donc +% avec ajout d'un label}.}. +% \end{enumerate} +% Pour pallier cela, la \nwejmauthorcl{} charge automatiquement le +% \Package{autonum} qui : +% \begin{enumerate} +% \item permet de ne recourir qu'aux environnements non-étoilés ; +% \item assure automatiquement que les formules effectivement numérotées seront +% celles, et seulement celles, s'avérant faire l'objet de références croisées au +% sein du document. +% \end{enumerate} +% +% \begin{bodycode}[listing and text] +% L'\vref{euler-identity} mérite une référence croisée. +% \begin{equation}\label{euler-identity} +% \E[\I\pi]+1=0 +% \end{equation} +% C'est bien la seule ici. +% \begin{equation}\label{not-interesting} +% 0=0 +% \end{equation} +% Malheureusement. +% \begin{equation} +% 1=1 +% \end{equation} +% \end{bodycode} \subsection{Acronymes} \label{sec:acronymes} @@ -1546,9 +1636,10 @@ différents packages sont donc à disposition des auteurs de la \nwejm{}. \end{description} \item[\package{kpfonts} :] police principale du document : \begin{description} - \item[option par défaut :] \docAuxKey{noDcommand} ; + \item[options par défaut :] \docAuxKey{noDcommand}, \docAuxKey{easyscsl} ; \end{description} \item[\package{graphicx} :] inclusion d'images ; +\item[\package{subcaption} :] sous-figures et sous-tableaux ; \item[\package{adjustbox} :] ajustement de la position de boîtes, par exemple d'images ; \item[\package{xspace} :] définition de commandes qui ne \enquote{mangent} pas @@ -1561,7 +1652,8 @@ différents packages sont donc à disposition des auteurs de la \nwejm{}. cf. \vref{sec-guillemets-citations}.} : \begin{description} \item[option par défaut :] \docAuxKey{autostyle} ; - \item[réglage par défaut] |\SetCiteCommand{\autocite}| ; + \item[réglage par défaut :] + \lstinline[alsolanguage={[csquotes]TeX},alsolanguage={[biblatex]TeX}]|\SetCiteCommand{\autocite}| ; \end{description} \item[\package{biblatex} :] gestion puissante de la bibliographie ; \item[\package{datetime2} :] formats de dates et de (zones de) temps : @@ -1572,14 +1664,22 @@ différents packages sont donc à disposition des auteurs de la \nwejm{}. hypertextes\footnote{Cf. \vref{sec-url}.} : \begin{description} \item[option par défaut :] \docAuxKey{hidelinks}, - \docAuxKey{hypertexnames}(|=false|) ; + \docAuxKey{pdfencoding}\lstinline[alsolanguage={[hyperref]TeX}]|=unicode|, + \docAuxKey{final}, \docAuxKey{breaklinks}, + \docAuxKey{hypertexnames}|=false| ; \end{description} \item[\package{glossaries} :] création de glossaires et (listes d')acronymes : \begin{description} \item[option par défaut :] \docAuxKey{nowarn} ; \end{description} -\item[\package{varioref} et \package{cleveref} :] références croisées - intelligentes\footnote{Cf. \vref{sec-references-croisees}.}. +\item[\package{varioref} :] références de pages intelligentes. +\item[\package{cleveref} :] références croisées + intelligentes\footnote{Cf. \vref{sec-references-croisees}.} ; + \begin{description} + \item[option par défaut :] \docAuxKey{french}, \docAuxKey{ngerman}, + \docAuxKey{dutch}, \docAuxKey{english}, \docAuxKey{noabbrev}, + \docAuxKey{capitalize}. + \end{description} \end{description} \subsection{Packages non chargés par la classe}\label{sec:packages-non-charges} @@ -1593,7 +1693,7 @@ notables sont précisés. \begin{description} \item[\package{tikz-cd} :] création simple de diagrammes commutatifs de très haute qualité\footnote{Le \Package{xy}, souvent utilisé pour de tels - diagrammes, est incomptible avec la présente : + diagrammes, est incomptible avec la présente classe : cf. \vref{sec-incompatibilites}.} ; \item[\package{pgfplots} :] création simple de graphiques (de dimensions~$2$ ou~$3$) de très haute qualité pour représenter des fonctions ou des données diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx b/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx index fa7f8d99445..55775e4db46 100644 --- a/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx +++ b/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx @@ -56,7 +56,7 @@ % \end{macrocode} % % \begin{macrocode} -\usepackage{lipsum} % Devrait ne pas être utilisé dans un vrai article! +\usepackage{lipsum} % Devrait ne pas être utilisé dans un vrai article ! \addbibresource{sample.bib} % Exemple de fichier bibliographique simple \addbibresource{biblatex-examples.bib} % Exemple de fichier bibliographique sophistiqué % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx index 9a90a6a3a1e..129e60adbd5 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 ------- -Release 2017/02/14 v0.98d +2018/04/07 v0.98e Development ----------- @@ -44,7 +44,7 @@ https://github.com/dbitouze/nwejm. \input l3docstrip.tex \Msg{********************************************************} \Msg{* Installation} -\Msg{* Class: nwejm 2017/02/14 v0.98d} +\Msg{* Class: nwejm 2018/04/07 v0.98e} \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, 2016, 2017 by Denis Bitouze +Copyright (C) 2015-2018 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,8 @@ Running "make install" installs the files in the local TeX tree. % %\maketitle % +% \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 % because of missing files in the 0.98c version when uploaded on CTAN.}% % \changes{v0.98c}{2017/02/09}{Example and template files now from `.dtx' and @@ -287,8 +289,8 @@ Running "make install" installs the files in the local TeX tree. \ProvidesExplClass % {nwejm} % {nwejmart} - {2017/02/14} - {0.98d} + {2018/04/07} + {0.98e} { Class for the journal "North-Western European Journal of Mathematics". } @@ -308,7 +310,7 @@ Running "make install" installs the files in the local TeX tree. \msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{You~ are~ using~ the~ `nwejm'~ class~ designed~ for~ the~ complete~ issues~ of~ the~ NWEJM~ and~ aimed~ for~ the~ NWEJM's~ team,~ not~ for~ authors~ of~ articles:~ if~ you're~ - an~ author~ of~ an~ article~,~ you~ should~ use~ the~ `nwejmart'~ class~ + an~ author~ of~ an~ article,~ you~ should~ use~ the~ `nwejmart'~ class~ instead.~ Otherwise,~ if~ you're~ from~ the~ NWEJM's~ team,~ please~ note~ that~ the~ issue's~ main~ file~ should~ be~ named~ `\tl_use:N\c_@@_main_file_name_tl.tex',~ not~ `\c_sys_jobname_str.tex'.~ @@ -383,6 +385,7 @@ Running "make install" installs the files in the local TeX tree. % % \begin{macrocode} \bool_new:N \g_@@_for_authors_bool +\bool_new:N \g_@@_for_printer_bool \bool_new:N \g_@@_cover_bool \bool_new:N \g_@@_coverpage_bool \bool_new:N \g_@@_inside_pages_bool @@ -438,6 +441,10 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % % \begin{macrocode} +\bool_new:N \g_@@_nolocaltoc_bool +% \end{macrocode} +% +% \begin{macrocode} % % \end{macrocode} % @@ -457,6 +464,9 @@ Running "make install" installs the files in the local TeX tree. 12pt .code:n = {% \PassOptionsToClass{12pt}{book} },% + draft .code:n = {% + \PassOptionsToClass{draft}{book} + },% % \end{macrocode} % % \begin{macrocode} @@ -519,8 +529,8 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \LoadClass { book } \PassOptionsToPackage{export}{adjustbox}% -\PassOptionsToPackage{fleqn}{mathtools}% -\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev}{cleveref} +\PassOptionsToPackage{fleqn}{amsmath}% +\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev,capitalize}{cleveref} % \end{macrocode} % % \begin{macrocode} @@ -613,103 +623,154 @@ Running "make install" installs the files in the local TeX tree. \RequirePackage{graphicx}% % \end{macrocode} % -% \item Establish input relative to a directory: +% \item Graphics package-alike macros for \enquote{general} boxes: % \begin{macrocode} -%\RequirePackage{import}% +\RequirePackage{adjustbox}% % \end{macrocode} % -% \item Put a grey textual watermark on document pages (loaded only if -% "forauthors" \nwejm{}'s option is on): +% \item References to other \LaTeX{} documents: % \begin{macrocode} -%\bool_if:nT { \g_@@_for_authors_bool } { -% \RequirePackage{draftwatermark}[2006/06/30]% -%} +\RequirePackage{xr} % \end{macrocode} % -% \item Graphics package-alike macros for \enquote{general} boxes: +% \item Provide file name and path of input files: % \begin{macrocode} -\RequirePackage{adjustbox}% +\RequirePackage{currfile} % \end{macrocode} % -% \item A new reference scheme for \LaTeX{}, giving the total number of pages in -% the document: +% \item A range of footnote options: % \begin{macrocode} -%\RequirePackage{zref-totpages} +\RequirePackage[multiple]{footmisc}% % \end{macrocode} % -% \item References to other \LaTeX{} documents: +% \item Notes in the margin, even where ×\marginpar× fails: % \begin{macrocode} -\RequirePackage{xr} +\RequirePackage{marginnote}% % \end{macrocode} % -% \item Provide file name and path of input files: +% \item Counter operations with label references: % \begin{macrocode} -\RequirePackage{currfile} +\RequirePackage{refcount}% % \end{macrocode} % -% \item A new reference scheme for \LaTeX{}, providing the facilities of the -% \package{xr} and \package{xr-hyper} packages: +% \item Extension of \LaTeX{}'s color facilities: % \begin{macrocode} -%\RequirePackage{zref-xr}% +\RequirePackage{xcolor}% % \end{macrocode} % -% \item A range of footnote options +% \item Execute command after the next page break: % \begin{macrocode} -\RequirePackage[multiple]{footmisc}% +\RequirePackage{afterpage}% % \end{macrocode} % -% \item Extension of \LaTeX{}'s color facilities: +% \item Determine if the current page is odd or even: % \begin{macrocode} -\RequirePackage{xcolor}% +\RequirePackage{ifoddpage}% +% \end{macrocode} +% +% \begin{macrocode} +% +% \end{macrocode} +% +% \begin{macrocode} +%<*class> +% \end{macrocode} +% +% \item Establish input relative to a directory: +% \begin{macrocode} +\RequirePackage{import}% +% \end{macrocode} +% +% \item Put a grey textual watermark on document pages (loaded only if +% "forauthors" \nwejm{}'s option is on): +% \begin{macrocode} +\bool_if:nT { \g_@@_for_authors_bool } { + \RequirePackage{draftwatermark}[2006/06/30]% +} +% \end{macrocode} +% +% \item A new reference scheme for \LaTeX{}, giving the total number of pages in +% the document: +% \begin{macrocode} +\RequirePackage{zref-totpages} +% \end{macrocode} +% +% \item A new reference scheme for \LaTeX{}, providing the facilities of the +% \package{xr} and \package{xr-hyper} packages: +% \begin{macrocode} +\RequirePackage{zref-xr}% % \end{macrocode} % % Some of the packages are needed only when the cover has to be produced. % \begin{macrocode} -%\bool_if:NTF {\g_@@_cover_bool} { +\bool_if:NTF {\g_@@_cover_bool} { % \end{macrocode} % % \item Coloured boxes, for \LaTeX{} examples and theorems, etc. % \begin{macrocode} -% \RequirePackage{tcolorbox} + \RequirePackage{tcolorbox} % \end{macrocode} % % \item A single TikZ node for the whole page (used for cover crop marks) % \begin{macrocode} -% \RequirePackage{tikzpagenodes} -% \ExplSyntaxOff -% \usetikzlibrary{calc,backgrounds} -% \ExplSyntaxOn -% \tcbuselibrary{skins} -% \tcbset{_@@_title_cover/.style={% -% colback=white, -% colframe=blue!37!white, -% colupper=blue, -% width=14cm, -% fontupper=\fontsize{9mm}{9mm}\fontseries{bx}\selectfont\sffamily, -% halign=center, -% valign=center, -% % boxsep=3mm, -% boxrule=3mm, -% left=\c_zero_dim, -% right=\c_zero_dim, -% sharp~corners, -% rounded~corners=northwest, -% % draft -% } -% } + \RequirePackage{tikzpagenodes} + \ExplSyntaxOff + \usetikzlibrary{calc,backgrounds} + \ExplSyntaxOn + \tcbuselibrary{skins} + \tcbset{_@@_title_cover/.style={% + colback=white, + colframe=blue!37!white, + colupper=blue, + width=14cm, + fontupper=\fontsize{9mm}{9mm}\fontseries{bx}\selectfont\sffamily, + halign=center, + valign=center, + % boxsep=3mm, + boxrule=3mm, + left=\c_zero_dim, + right=\c_zero_dim, + sharp~corners, + rounded~corners=northwest, + % draft + } + } % \end{macrocode} % % \item Macros for drawing graphs of graph theory (used for the backcover image) % \begin{macrocode} -% \RequirePackage{tkz-berge} -%}{ + \RequirePackage{tkz-berge} +}{ % \end{macrocode} % % Typically, the \Package{standalone} is not used for the cover. % \item Compile \TeX{} pictures stand-alone or as part of a document: % \begin{macrocode} -%\RequirePackage[group=false,subpreambles,sort]{standalone}% -%} +\RequirePackage[group=false,subpreambles,sort]{standalone}% +} +% \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}% +% \end{macrocode} +% +% \begin{macrocode} +% +% \end{macrocode} +% +% \begin{macrocode} +%<*class|class-article> +% \end{macrocode} +% +% \item Control float placement: +% \begin{macrocode} +\RequirePackage{placeins}% % \end{macrocode} % % \item Define commands that appear not to eat spaces: @@ -743,12 +804,12 @@ Running "make install" installs the files in the local TeX tree. % % \item Extensions to theorem environments: % \begin{macrocode} -\RequirePackage[thmmarks,amsmath]{ntheorem} +\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem} % \end{macrocode} % % \item Support for using RSFS fonts in maths: % \begin{macrocode} -\RequirePackage{mathrsfs} +\RequirePackage{rsfso} % \end{macrocode} % % \item Vector arrows: @@ -758,8 +819,8 @@ Running "make install" installs the files in the local TeX tree. % % Load of main font to be used: % \begin{macrocode} -%\RequirePackage[easyscsl,noDcommand]{kpfonts} -%\RequirePackage[noDcommand]{kpfonts} +\RequirePackage[easyscsl,noDcommand]{kpfonts} +% %\RequirePackage[noDcommand]{kpfonts} % \end{macrocode} % % \item Flexible and easy interface to page dimensions: @@ -787,6 +848,11 @@ Running "make install" installs the files in the local TeX tree. \RequirePackage{varioref} % \end{macrocode} % +% \item Support for sub-captions (rather sub-floats): +% \begin{macrocode} +\RequirePackage{subcaption} +% \end{macrocode} +% % \item Section numbering (and table of contents control but this is canceled % by \Package{etoc}): % \begin{macrocode} @@ -800,7 +866,7 @@ Running "make install" installs the files in the local TeX tree. % % \item Subliminal refinements towards typographical perfection: % \begin{macrocode} -\RequirePackage[babel=true]{microtype}% +\RequirePackage[babel=true,final]{microtype}% % \end{macrocode} % % \item Current date and time formatting: @@ -818,21 +884,6 @@ Running "make install" installs the files in the local TeX tree. \RequirePackage{environ} % \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}% -% \end{macrocode} -% -% \item Control float placement: -% \begin{macrocode} -%\RequirePackage{placeins}% -% \end{macrocode} -% % \item Improve on \LaTeX{}'s footnote handling (useful for its ×\savenotes× and % ×\spewnotes× commands added to theorems environment in order footnotes are % not trapped within them). @@ -848,9 +899,9 @@ Running "make install" installs the files in the local TeX tree. % % \item Hypertext marks: % \begin{macrocode} -\RequirePackage[hyperfootnotes=false,pdfencoding=unicode]{hyperref}% +\RequirePackage[hyperfootnotes=false,pdfencoding=unicode,final]{hyperref}% \AtBeginDocument{% - \hypersetup{hidelinks,hypertexnames=false}% + \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% % \end{macrocode} % @@ -874,9 +925,12 @@ Running "make install" installs the files in the local TeX tree. \RequirePackage{cleveref}% % \end{macrocode} % -% \item Automatic equation references: +% \item Automatic equation references (we first make use of a workaround due to +% Enrico Gregorio in order to get rid of the warning about \package{etex} --~ +% see https://tex.stackexchange.com/a/285953/18401): % \begin{macrocode} -\RequirePackage{autonum} +\expandafter\def\csname ver@etex.sty\endcsname{3000/12/31} +\let\globcount\newcount % \end{macrocode} % % \end{enumerate} @@ -1087,7 +1141,7 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % For the asides opening and eventuelly closing punctuation marks. % \begin{macrocode} -\tl_const:Nn \c_@@_aside_string_tl {--} +\tl_const:Nn \c_@@_aside_string_tl {---} % \end{macrocode} % For the draft watermark. % \begin{macrocode} @@ -1107,6 +1161,12 @@ Running "make install" installs the files in the local TeX tree. \tl_const:Nn \c_@@_issue_number_year_file_string_tl {\c_@@_main_file_name_tl.iny} % \end{macrocode} % +% % For the name of the file containing the informations needed to separate the +% % PDF files for both the individual articles and for the issue for the printer. +% % \begin{macrocode} +% \tl_const:Nn \c_@@_issue_informations_separate_file_string_tl {\c_@@_main_file_name_tl.ipr} +% % \end{macrocode} +% % For the prefix of the bibliographic key of each article. % \begin{macrocode} \tl_const:Nn \c_@@_issue_bib_key_tl {\int_use:N \g_@@_issue_number_int} @@ -1195,6 +1255,14 @@ Running "make install" installs the files in the local TeX tree. \dim_const:Nn \c_@@_printer_layoutoffset_dim { 10mm } % \end{macrocode} % +% \begin{macrocode} +% +% \end{macrocode} +% +% \begin{macrocode} +%<*class> +% \end{macrocode} +% % We define a \enquote{potential} layout offset dimension which is non-zero (and % the equal to \enquote{printer} layout offset dimension) iff the output is % prepared for the printer ("\g_@@_for_printer_bool" flag equals true). @@ -1206,14 +1274,6 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % -% \begin{macrocode} -% -% \end{macrocode} -% -% \begin{macrocode} -%<*class> -% \end{macrocode} -% % We define a \enquote{printer} binding dimension % "\c_@@_printer_bindingoffset_dim", fixed by the printer to have different % values depending on some total pages thresholds. If the binding dimension is @@ -1307,14 +1367,6 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % -% \begin{macrocode} -% -% \end{macrocode} -% -% \begin{macrocode} -%<*class|class-article> -% \end{macrocode} -% % The binding offset is applied iff the front cover is required ("frontcover" % option), which implies the output is prepared for the printer, with non-zero % offset ("\g_@@_for_printer_bool" flag equals true). @@ -1330,14 +1382,22 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % +% \begin{macrocode} +% +% \end{macrocode} +% +% \begin{macrocode} +%<*class|class-article> +% \end{macrocode} +% % The paper height is rather simple: it is always the layout height dimension % plus 2 times (top and bottom) the layout offset dimension (which turns to be % non-zero iff the output is prepared for the printer). % \begin{macrocode} \dim_const:Nn \c_@@_paperheight_dim { \c_@@_layoutheight_dim - + - 2\c_@@_potential_layoutoffset_dim +% + +% 2\c_@@_potential_layoutoffset_dim } % \end{macrocode} % @@ -1353,23 +1413,23 @@ Running "make install" installs the files in the local TeX tree. % \end{description} % \end{itemize} % \begin{macrocode} -\bool_if:NTF {\g_@@_cover_bool} { - \dim_const:Nn \c_@@_paperwidth_dim { - \c_@@_layoutwidth_dim - + - \c_@@_potential_layoutoffset_dim - + - .5\c_@@_potential_bindingoffset_dim - } -}{ +%\bool_if:NTF {\g_@@_cover_bool} { +% \dim_const:Nn \c_@@_paperwidth_dim { +% \c_@@_layoutwidth_dim +% + +% \c_@@_potential_layoutoffset_dim +% + +% .5\c_@@_potential_bindingoffset_dim +% } +%}{ \dim_const:Nn \c_@@_paperwidth_dim { \c_@@_layoutwidth_dim - + - 2 - \c_@@_potential_layoutoffset_dim - +\c_@@_potential_bindingoffset_dim +% + +% 2\c_@@_potential_layoutoffset_dim +% + +% \c_@@_potential_bindingoffset_dim } -} +%} % \end{macrocode} % % \begin{macrocode} @@ -1441,19 +1501,19 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % -% When the inside pages are produced, the crop marks are shown. % \begin{macrocode} -\bool_if:NT {\g_@@_inside_pages_bool} { - \geometry{showcrop} -} +% % \end{macrocode} % % \begin{macrocode} -% +%<*class> % \end{macrocode} % +% When the inside pages are produced, the crop marks are shown. % \begin{macrocode} -%<*class> +\bool_if:NT {\g_@@_inside_pages_bool} { + \geometry{showcrop} +} % \end{macrocode} % % We create a constant token list that contains the geometry of the front cover. @@ -1557,7 +1617,7 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \tl_const:Nn \c_@@_main_geometry_tl {% ,layoutsize={\c_@@_layoutwidth_dim,\c_@@_layoutheight_dim} - ,layoutoffset=\c_@@_potential_layoutoffset_dim +% ,layoutoffset=\c_@@_potential_layoutoffset_dim ,textwidth=\c_@@_layoutwidth_dim*3/4 ,textheight=\c_@@_layoutheight_dim*3/4 % ,marginratio={4\string :6,5\string :7} @@ -1588,14 +1648,14 @@ Running "make install" installs the files in the local TeX tree. % % \section{Miscellaneous patches} % -% If we don't ask the cover page (only), the inside back cover and back cover -% pages are automatically included at the end of the document, the former -% containing some condensed instructions to authors. But, this cannot be done -% within "\AtEndDocument" and "\preto\@enddocumenthook" should be used instead -% (see \url{http://tex.stackexchange.com/q/240318/18401}). -% \begin{macrocode} -\bool_if:NF {\g_@@_coverpage_bool} { - \bool_if:NF {\g_@@_inside_pages_bool} { +% % If we don't ask the cover page (only), the inside back cover and back cover +% % pages are automatically included at the end of the document, the former +% % containing some condensed instructions to authors. But, this cannot be done +% % within "\AtEndDocument" and "\preto\@enddocumenthook" should be used instead +% % (see \url{http://tex.stackexchange.com/q/240318/18401}). +% % \begin{macrocode} +% \bool_if:NF {\g_@@_coverpage_bool} { +% \bool_if:NF {\g_@@_inside_pages_bool} { % \preto\@enddocumenthook{ % % \end{macrocode} % % @@ -1617,9 +1677,9 @@ Running "make install" installs the files in the local TeX tree. % \@openrightfalse % \g_@@_display_backcover_tl % }% - }% -}% -% \end{macrocode} +% }% +% }% +% % \end{macrocode} % % % If we don't ask the cover page (only), the document total page numbers should % % be a multiple of four and we add the necessary and sufficient number of blank @@ -1667,6 +1727,10 @@ Running "make install" installs the files in the local TeX tree. } \bool_gset_true:N \g_@@_tableofcontents_already_used_bool }% +\renewcommand\etocaftercontentshook +{% + \exp_after:wN\newgeometry\exp_after:wN{\c_@@_main_geometry_tl}% +}% % \end{macrocode} % % \section{Page styles} @@ -1758,10 +1822,10 @@ Running "make install" installs the files in the local TeX tree. \newpagestyle{@@_mainmatter_ps}[]{% \sethead% [ - \tl_if_exist:NT {\g_@@_short_title_tl} + \tl_if_exist:NT {\g_@@_header_title_tl} { - \tl_if_empty:NF \g_@@_short_title_tl {% - \slshape\g_@@_short_title_tl + \tl_if_empty:NF \g_@@_header_title_tl {% + \slshape\g_@@_header_title_tl } } ]% @@ -2473,7 +2537,8 @@ Running "make install" installs the files in the local TeX tree. % } \setlist[description,1]{font=\scshape\bfseries} \footnotesize% - \begin{multicols*}{2} + \begin{multicols*}{2} + \raggedright \setlength{\columnsep}{1mm} \begin{description}[leftmargin=2em] \item[\c_@@_editorinchief_string_tl] \ @@ -2699,7 +2764,7 @@ Running "make install" installs the files in the local TeX tree. \tl_gclear:N \g_@@_keywords_tl \tl_clear:N \l_tmpb_clist \clist_set:Nn \l_tmpb_clist {#2} - \tl_set:Nn \g_@@_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } + \tl_set:Nx \g_@@_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } % \tl_if_empty:nTF {#1} {% % \hypersetup{pdfkeywords={\g_@@_keywords_tl}} % }{ @@ -2982,6 +3047,14 @@ Running "make install" installs the files in the local TeX tree. } } % \end{macrocode} +% \begin{macrocode} +% +% \end{macrocode} +% +% \begin{macrocode} +%<*class|class-article> +% \end{macrocode} +% % \end{macro} % % \subsection{\Pkg{Varioref}} @@ -2989,31 +3062,30 @@ Running "make install" installs the files in the local TeX tree. % We have to save the extra definitions of the \Pkg{varioref} which currently is % multilingual aware. % \begin{macrocode} -\addto\extrasfrench{% +\vref@addto\extrasfrench{% \def\reftextfaceafter {page~\reftextvario{ci-contre}{suivante}}% \def\reftextfacebefore{page~\reftextvario{ci-contre}% - {pr\’ec\’edente}}% + {pr\'ec\'edente}}% \def\reftextafter {page~suivante}% \def\reftextbefore - {page~pr\’ec\’edente}% - \def\reftextcurrent - {de~la~pr\’esente~page}% - \def\reftextfaraway#1{page~\pageref{#1}}% - \def\reftextpagerange#1#2{pages~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1}~\‘a~\ref{#2}}% -} -\addto\extrasngerman{% + {page~pr\'ec\'edente}% + \def\reftextcurrent {de~la~pr\'esente~page}% + \def\reftextfaraway#1{p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{p.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~\‘a\nobreakspace\ref{#2}}% +} +\vref@addto\extrasngerman{% \def\reftextfaceafter {auf~der~n\"achsten~Seite}% \def\reftextfacebefore{auf~der~vorherigen~Seite}% \let\reftextafter \reftextfaceafter \let\reftextbefore \reftextfacebefore \def\reftextcurrent {auf~dieser~Seite}% - \def\reftextfaraway#1{auf~Seite~\pageref{#1}}% - \def\reftextpagerange#1#2{auf~den~Seiten~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1}~bis~\ref{#2}}% + \def\reftextfaraway#1{auf~S.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{auf~den~S.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~bis\nobreakspace\ref{#2}}% } -\addto\extrasdutch{% +\vref@addto\extrasdutch{% \def\refpagename{pagina}% \def\reftextfaceafter {op~de~\reftextvario{rechter~\refpagename}% {\refpagename\ hiernaast}}% @@ -3024,27 +3096,24 @@ Running "make install" installs the files in the local TeX tree. \def\reftextbefore {op~de~\reftextvario{vorige~\refpagename}% {\refpagename\ hiervoor}}% \def\reftextcurrent {op~deze~\refpagename}% - \def\reftextfaraway#1{op~\refpagename\c_space_tl\pageref{#1}} + \def\reftextfaraway#1{op~\refpagename\nobreakspace\pageref{#1}} } -\addto\extrasenglish{% +\vref@addto\extrasenglish{% \def\reftextfaceafter {on~the~\reftextvario{facing}{next}~page}% \def\reftextfacebefore{on~the~\reftextvario{facing}{preceding}~page}% \def\reftextafter {on~the~\reftextvario{following}{next}~page}% \def\reftextbefore {on~the~\reftextvario{preceding}{previous}~page}% \def\reftextcurrent {on~\reftextvario{this}{the~current}~page}% - \def\reftextfaraway#1{on~page~\pageref{#1}}% - \def\reftextpagerange#1#2{on~pages~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1}~to~\ref{#2}}% + \def\reftextfaraway#1{on~p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{on~pp.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~to\nobreakspace\ref{#2}}% } % \end{macrocode} -% \end{macro} % +% We don't want randomization in the \package{varioref} expressions in order to +% reduce discrepancies between the whole issue and the individual articles. % \begin{macrocode} -% -% \end{macrocode} -% -% \begin{macrocode} -%<*class|class-article> +\def\reftextvario#1#2{#2} % \end{macrocode} % % \subsection{Article setup} @@ -3086,6 +3155,64 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % \end{macro} % +% Because of the ×capitalize× option passed to \Package{cleveref}, the names of +% the references (\enquote{chapter}, \enquote{theorem}, etc.) have their first +% letter capitalised (even with ×\cref×), which fit the English/Amercian +% typographic rules, but not the French ones. Hence, we redefine these +% references' names in French in order ×\cref× gives their lower case +% version. Because this redefinition is needed more than once, we store it in +% the ×\g_@@_french_crefname_tl× token list. +% \begin{macrocode} +\tl_gset:Nn \g_@@_french_crefname_tl { + \clist_set:Nn \l_tmpa_clist {% + theorem, + corollary, + conjecture, + proposition, + lemma, + axiom, + definition, + remark, + example, + notation, + proof% + } + \clist_map_inline:Nn \l_tmpa_clist { + \crefname{#1}{ + \tl_lower_case:n{ + \GetTranslationFor{french}{#1} + } + }{% + \tl_lower_case:n{ + \GetTranslationFor{french}{plural-#1} + } + } + } + \crefname{equation}{{\'e}quation}{{\'e}quations}% + \crefname{figure}{figure}{figures}% + \crefname{table}{table}{tables}% + \crefname{page}{page}{pages}% + \crefname{part}{partie}{parties}% + \crefname{chapter}{chapitre}{chapitres}% + \crefname{section}{section}{sections}% + \crefname{appendix}{annexe}{annexes}% + \crefname{enumi}{point}{points}% + \crefname{footnote}{note}{notes}% + \crefname{theorem}{th\'eor\`eme}{th\'eor\`emes}% + \crefname{lemma}{lemme}{lemmes}% + \crefname{corollary}{corollaire}{corollaires}% + \crefname{proposition}{proposition}{propositions}% + \crefname{definition}{d\'efinition}{d\'efinitions}% + \crefname{result}{r\'esultat}{r\'esultats}% + \crefname{example}{exemple}{exemples}% + \crefname{remark}{remarque}{remarques}% + \crefname{note}{commentaire}{commentaires}% + \crefname{algorithm}{algorithme}{algorithmes}% + \crefname{listing}{liste}{listes}% + \crefname{line}{ligne}{lignes}% +} +% \end{macrocode} +% % \subsection{Input variant} % % We create a variant of the "\input" macro to be use for the input of each @@ -3097,7 +3224,12 @@ Running "make install" installs the files in the local TeX tree. \tl_if_eq:nnTF { #1 } { german } {% \selectlanguage{ngerman} }{ - \selectlanguage{#1} + \tl_if_eq:nnTF { #1 } { french } {% + \selectlanguage{french} + \g_@@_french_crefname_tl + }{ + \selectlanguage{#1} + } }% % \end{macrocode} % @@ -3113,9 +3245,9 @@ Running "make install" installs the files in the local TeX tree. % % We reset setup possibly chosen in previous articles. % \begin{macrocode} -% \bool_gset_false:N \g_@@_gradient_nabla_bool -% \bool_gset_false:N \g_@@_gradient_nabla_control_bool -% \bool_gset_false:N \g_@@_grad_used_bool +% \bool_gset_false:N \g_@@_gradient_nabla_bool +% \bool_gset_false:N \g_@@_gradient_nabla_control_bool +% \bool_gset_false:N \g_@@_grad_used_bool % \end{macrocode} % % \begin{macrocode} @@ -3201,7 +3333,7 @@ Running "make install" installs the files in the local TeX tree. % title} is store in "\g_@@_title_tl" for later use. % \begin{macrocode} \tl_new:N \g_@@_title_tl -\RenewDocumentCommand \title { o m } { +\RenewDocumentCommand \title { o o m } { % \end{macrocode} % % We don't want the (next) title to appear in the headers of the preceding @@ -3215,16 +3347,24 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \int_gincr:N \g_@@_articles_int \tl_gclear:N \g_@@_short_title_tl + \tl_gclear:N \g_@@_header_title_tl \tl_gclear:N \g_@@_short_subtitle_tl % \IfNoValueF {#1} { \tl_gset:Nn \g_@@_short_title_tl {#1} } - \tl_gset:Nn \g_@@_title_tl {#2} + \IfNoValueF {#2} + { + \tl_gset:Nn \g_@@_header_title_tl {#2} + } + \tl_gset:Nn \g_@@_title_tl {#3} \tl_if_empty:NT \g_@@_short_title_tl {% \tl_gset_eq:NN \g_@@_short_title_tl \g_@@_title_tl } + \tl_if_empty:NT \g_@@_header_title_tl {% + \tl_gset_eq:NN \g_@@_header_title_tl \g_@@_short_title_tl + } } % \end{macrocode} % \end{macro} @@ -3465,9 +3605,9 @@ Running "make install" installs the files in the local TeX tree. % % 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 -% what is before provides floats but not acknowledgments). +% what is before provides floats but not acknowledgments). % \begin{macrocode} -% \FloatBarrier% +% \FloatBarrier% % \end{macrocode} % % We store the unique bibliographic key of the current article in the @@ -3685,6 +3825,17 @@ Running "make install" installs the files in the local TeX tree. \tl_gclear:N \g_@@_people_affiliation_tl \tl_gclear:N \g_@@_people_email_tl \tl_clear:N \l_@@_people_first_last_names_tl% +% % \end{macrocode} +% % +% % We insert an invisible local table of contents that will take in account all +% % the sections, subsections, etc. of the article. This local TOC has a label +% % that will be used to display this TOC at the end of the article. +% % \begin{macrocode} +% \etocarticlestyle +% \tl_set:Nn \l_@@_localtableofcontents_label_tl {% +% localtableofcontents-\int_use:N \g_@@_articles_int +% } +% \invisiblelocaltableofcontents \label{\l_@@_localtableofcontents_label_tl} } % \end{macrocode} % \end{macro} @@ -3765,7 +3916,8 @@ Running "make install" installs the files in the local TeX tree. \cs_set_eq:NN \_@@_subsection \subsection \cs_set_eq:NN \_@@_subsubsection \subsubsection \AfterPreamble{% - \RenewDocumentCommand \section { s o m } {% + \RenewDocumentCommand \section { s o o m } {% + \tl_gclear:N \g_@@_short_section_title_tl \IfBooleanTF {#1} { \setsecnumdepth{none}% @@ -3773,7 +3925,16 @@ Running "make install" installs the files in the local TeX tree. { \resetsecnumdepth*% } - \IfNoValueTF{#2}{\_@@_section{#3}}{\_@@_section[#2]{#3}} + \tl_gset:Nn \g_@@_section_title_tl {#4} + \IfNoValueTF{#2}{ + \tl_gset:Nn \g_@@_short_section_title_tl {#4} + }{ + \tl_gset:Nn \g_@@_short_section_title_tl {#2} + } + \_@@_section[\g_@@_short_section_title_tl]{\g_@@_section_title_tl} + \IfNoValueF {#3}{ + \sectionmark{#3} + } } \RenewDocumentCommand \subsection { s o m } {% \IfBooleanT {#1} @@ -3859,6 +4020,16 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % +% \section{Miscellaneous for captions} +% +% We set the caption label separator to make it the same as theorems separator. +% \begin{macrocode} +\DeclareCaptionLabelSeparator{dash}{\nobreakspace--\nobreakspace} +\captionsetup{ + labelsep=dash + } +% \end{macrocode} +% % \section{Miscellaneous (re)definitions} % % We gather here miscellaneous redefinitions. @@ -3952,8 +4123,9 @@ Running "make install" installs the files in the local TeX tree. % % \subsection{Usual theorems and the like} % -% Some usual theorems and the like are defined, thanks to \Pkg{thmtools}. First, -% we define a private function "\_@@_new_theorem" that defines: +% Some usual theorems and the like are defined, thanks to \Pkg{thmtools} build +% upon \Pkg{ntheorem}. First, we define a private function "\_@@_new_theorem" +% that defines: % \begin{enumerate} % \item a new (private, \pkg{thmtools}) theorem with 4 arguments: % \begin{enumerate} @@ -4186,12 +4358,16 @@ Running "make install" installs the files in the local TeX tree. } \clist_map_inline:Nn \l_tmpa_clist { \crefname{#1}{ - \GetTranslation{#1} - }{% - \GetTranslation{plural-#1} + \tl_mixed_case:n{ + \GetTranslation{#1} + } + }{ + \tl_mixed_case:n{ + \GetTranslation{plural-#1} + } } \Crefname{#1}{ - \tl_mixed_case:n{ \protect + \tl_mixed_case:n{ \GetTranslation{#1} } }{% @@ -4200,6 +4376,9 @@ Running "make install" installs the files in the local TeX tree. } } } +\AfterEndPreamble{ + \ifcurrentbaselanguage{french}{\g_@@_french_crefname_tl}{} +} % \end{macrocode} % % \subsection{Assertions and hypotheses enumerations} @@ -4538,19 +4717,11 @@ Running "make install" installs the files in the local TeX tree. #1 } \NewDocumentCommand \set { m O{} } { - \if@display \tl_if_empty:nTF {#2} {% \_@@_set*{#1} }{ \_@@_set*{#1\l_@@_given_tl #2} } - \else - \tl_if_empty:nTF {#2} {% - \_@@_set{#1} - }{ - \_@@_set{#1\l_@@_given_tl #2} - } - \fi } % \end{macrocode} % @@ -4692,32 +4863,405 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % -% \section{Packages settings, libraries loading, etc.} +% \section{Multiline equations} % -% We gather here miscellaneous settings. +% Thanks to the \package{amsmath}'s ×\allowdisplaybreaks× macro, we let page +% breaks fall where they may, even in the middle of a multi-line equation. If +% needed, the ×\\*× command can be used to prohibit a pagebreak after a given line. +% \begin{macrocode} +\AtEndPreamble{\allowdisplaybreaks} +% \end{macrocode} % -% \subsection{Related to \Pkg{autonum}} +% The drawback of ×\allowdisplaybreaks× macro is it may happen we haven't +% a view on all the multiline equation. In order to reduce this drawback, +% a solution is to add a marginal note notifying the equation continues next +% page if a page break occurs within it. Here is a solution for this (at least +% for ×align(*)× and ×multline(*)× environments) that requires to +% make use of \package{marginnote}'s ×\marginnote× macro, because the usual +% ×\marginpar× doesn't work within math mode. % -% We add \pkg{autonum} support for ×\vref× referencing command: +% Each multiline equation will have a unique number. % \begin{macrocode} -\AfterEndPreamble{ - \autonum@generatePatchedReferenceCSL{vref} +\int_new:N \g_multiline_eq_int +% \end{macrocode} +% Each line of a multiline equation will have a unique number (local +% to the multiline equation). +% \begin{macrocode} +\int_new:N \g_line_of_multiline_eq_int +% \end{macrocode} +% \begin{macrocode} +\tl_new:N \g_line_of_multiline_eq_label_tl +\tl_new:N \g_next_line_of_multiline_eq_label_tl +% \end{macrocode} +% We save the original environments +% \begin{macrocode} +\clist_set:Nn \l_tmpa_clist {align,multline} +\clist_map_inline:Nn \l_tmpa_clist { + \cs_set_eq:cc {db_#1_start:} {#1} + \cs_set_eq:cc {db_#1_end:} {end#1} + \cs_set_eq:cc {db_#1_star_start:} {#1*} + \NewDocumentEnvironment{amsmath#1}{} + {\cs:w db_#1_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} + \NewDocumentEnvironment{amsmath#1*}{} + {\cs:w db_#1_star_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} +% \end{macrocode} +% ... and create their new versions. +% \begin{macrocode} + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {#1} \BODY + } + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {#1*} \BODY + } +} +% \end{macrocode} +% We need to know whether or not we are in a patched environment in order to, in +% the latter case, not patch the ×\intertext× and ×\shortintertext×. +% \begin{macrocode} +\bool_new:N \g_@@_within_patched_amsmath_env_bool +% \end{macrocode} +% The environments ×flalign(*)× and ×alignat(*)× cannot be patched when +% ×align(*)× is patched as above (see +% \url{https://tex.stackexchange.com/q/399979/18401}). As a workaround, we make +% these environments the same as ×align(*)×. +% \begin{macrocode} +\clist_set:Nn \l_tmpa_clist {flalign,alignat} +\clist_map_inline:Nn \l_tmpa_clist { + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {align} \BODY + } + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {align*} \BODY + } +} % \end{macrocode} % -% The \Pkg{autonum} deletes the definitions of the starred versions of the -% ×equation×, ×align×, ×gather×, ×multline×, ×flalign× environments and that -% may be troubling for the user. Hence we redefine them to be the same as their -% unstarred counterparts: +% The new versions of ×align(*)× and ×multline(*)× are defined +% thanks to the following ×\db_multiline_eq× control sequence. % \begin{macrocode} - \clist_set:Nn \l_tmpa_clist {equation,align,gather,multline,flalign} - \clist_map_inline:Nn \l_tmpa_clist { - \cs_set_eq:cc {#1*} {#1} - \cs_set_eq:cc {end#1*} {end#1} +\seq_new:N \l_db_multiline_eq_seq +\cs_new_protected:Nn \db_multiline_eq:nn +{ +% \end{macrocode} +% +% We set the unique number of the current multiline equation. +% \begin{macrocode} + \int_gincr:N \g_multiline_eq_int +% \end{macrocode} +% +% The number of the 1st line of the current multiline equation is $1$. +% \begin{macrocode} + \int_zero:N \g_line_of_multiline_eq_int + \int_gincr:N \g_line_of_multiline_eq_int +% \end{macrocode} +% +% We globally define the strings of the labels identfying: +% \begin{itemize} +% \item the current line, +% \item the line following the current one, +% \end{itemize} +% of the current multiline equation. +% \begin{macrocode} + \tl_gset:Nx \g_tmpa_tl { + multilineeq + - + \int_use:N \g_multiline_eq_int + - + line + - + } + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} } - % \msg_warning:nnn{nwejmart}{Starred~AMS~environments}{#1} +% \end{macrocode} +% +% We set the label of the current line. +% \begin{macrocode} + \ltx@label{\g_line_of_multiline_eq_label_tl} + % + \seq_set_split:Nnn \l_db_multiline_eq_seq { \\ } { #2 } + \tl_if_in:nnTF {#1} {multline} { + \begin{amsmath#1} + \bool_gset_true:N \g_@@_within_patched_amsmath_env_bool + \seq_use:Nnnn \l_db_multiline_eq_seq + { \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@double@space } + \hfill + \end{amsmath#1} + \bool_gset_false:N \g_@@_within_patched_amsmath_env_bool + }{ + \begin{amsmath#1} + \bool_gset_true:N \g_@@_within_patched_amsmath_env_bool + \seq_use:Nn \l_db_multiline_eq_seq { \multiline@double@backslash } + \end{amsmath#1} + \bool_gset_false:N \g_@@_within_patched_amsmath_env_bool + } + } +% \end{macrocode} +% +% We create a variant of ×\db_multiline_eq× which returns a value. +% \begin{macrocode} +\cs_generate_variant:Nn \db_multiline_eq:nn { nV } +% \end{macrocode} +% +% We create the control sequences involved in ×\db_multiline_eq×. +% \begin{macrocode} +\cs_new_protected:Nn \db_multiline_double_backslash:nn +{ + \db_add_marginal_note: + \IfValueTF{#2}{% + \IfBooleanTF{#1}{\\*[#2]}{\\[#2]}% + }{% + \IfBooleanTF{#1}{\\*}{\\}% + }% + % + \db_add_multiline_eq_label: +} +% \end{macrocode} +% \begin{macrocode} +\NewDocumentCommand{\multiline@double@backslash}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} +} +\NewDocumentCommand{\multiline@double@backslash@add@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{\mathindent} +} +\NewDocumentCommand{\multiline@double@backslash@add@double@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{2\mathindent} +} +% \end{macrocode} +% \begin{macrocode} +\cs_new_protected:Nn \db_add_marginal_note: +{ +% \end{macrocode} +% +% If (and only if) the pageref of the next line if greater than the +% current line's one, we insert a marginal note telling the equation +% continues on next page. +% \begin{macrocode} + \int_compare:nNnT { + \getpagerefnumber{\g_next_line_of_multiline_eq_label_tl}% + }>{ + \getpagerefnumber{\g_line_of_multiline_eq_label_tl}% + }{ + \reversemarginpar + \marginnote[\g_@@_equation_continues_next_page_tl]{} + \normalmarginpar + \marginnote[\g_@@_equation_continues_next_page_tl]{} + } +} +% \end{macrocode} +% +% We define the content of the marginal note. +% \begin{macrocode} +\tl_gset:Nn \g_@@_equation_continues_next_page_tl { + \tiny + \sffamily + \slshape + ( + \GetTranslation{equation-continues-next-page} + ) +} +% \end{macrocode} +% +% \begin{macrocode} +\cs_new_protected:Nn \db_add_multiline_eq_label: +{ +% \end{macrocode} +% +% Do nothing on first pass. +% \begin{macrocode} + \ifmeasuring@\else +% \end{macrocode} +% +% We set the unique number of the current multiline equation. +% \begin{macrocode} + \int_gincr:N \g_line_of_multiline_eq_int +% \end{macrocode} +% +% We set the label of the current line. +% \begin{macrocode} + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} + } + \ltx@label{\g_line_of_multiline_eq_label_tl}% + \fi +} +% \end{macrocode} +% We need to redefine the ×\intertext× and ×\shortintertext× macros (re)defined +% by \Pkg{amsmath} and \Pkg{mathtools} in order they display the marginal note +% notifying the equation continues next page if a page break occurs at their level. +% \begin{macrocode} +\def\MT_intertext: {% + \def\intertext##1{% + \db_add_marginal_note: + \ifvmode\else\\\@empty\fi + \noalign{% + \penalty\postdisplaypenalty\vskip\belowdisplayskip + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + \vbox{\normalbaselines + \ifdim + \ifdim\@totalleftmargin=\z@ + \linewidth + \else + -\maxdimen + \fi + =\columnwidth + \else \parshape\@ne \@totalleftmargin \linewidth + \fi + \noindent\ignorespaces##1\par}% + \penalty\predisplaypenalty\vskip\abovedisplayskip% + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + }% + \db_add_multiline_eq_label: + }% + \MH_let:NwN \shortintertext \shortintertext@ +} +% \end{macrocode} +% \begin{macrocode} +\pretocmd{\MT_orig_shortintertext:n}{% + \bool_if:NT \g_@@_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_orig_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +\pretocmd{\MT_shortintertext:n}{% + \bool_if:NT \g_@@_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +% \end{macrocode} +% \begin{macrocode} +\setkeys{\MT_options_name:}{ + original-intertext=false, + original-shortintertext=false +} +% \end{macrocode} +% +% We adapt a patch from Gonzalo Medina in order marginal notes ×\marginnote× +% always are on leeft side of the page (see +% \url{https://tex.stackexchange.com/a/69624/18401}). +% \begin{macrocode} +\newcommand*{\nwejm@marginnote}{% + \@dblarg\NWEJM@mn@marginnote +} +\newcommand{\NWEJM@mn@marginnote}[2][]{% + \ifhmode + \@bsphack + \begingroup + \ifdim\@savsk>\z@\else + \def\:{\@xifnch}\expandafter\def\: { \futurelet\@let@token\@ifnch}% + \fi + \else + \begingroup + \fi + \@ifnextchar [{\NWEJM@mn@@marginnote[{#1}]{#2}}{\NWEJM@mn@@marginnote[{#1}]{#2}[\z@]}% +} +\newcommand{\NWEJM@mn@@marginnote}{} +\long\def\NWEJM@mn@@marginnote[#1]#2[#3]{% + \endgroup + \ifhmode + \NWEJM@mn@@@marginnote[{#1}]{#2}[{#3}]% + \@esphack + \else + \NWEJM@mn@@@marginnote[{#1}]{#2}[{#3}]% + \fi +} + +\long\def\NWEJM@mn@@@marginnote[#1]#2[#3]{% + \begingroup + \ifmmode\mn@strut\let\@tempa\mn@vadjust\else + \if@inlabel\leavevmode\fi + \ifhmode\mn@strut\let\@tempa\mn@vadjust\else\let\@tempa\mn@vlap\fi + \fi + \@tempa{% + \vbox to\z@{% + \vss + \@mn@margintest + \if@reversemargin\if@tempswa + \@tempswafalse + \else + \@tempswatrue + \fi\fi + \rlap{% + \ifx\@mn@currxpos\relax + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else\ifx\@mn@currxpos\@empty + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos seems to be \@mn@currxpos,\MessageBreak + \string\marginnoterightadjust + \space ignored}% + \fi + \begingroup + \setlength{\@tempdima}{\@mn@currxpos}% + \kern-\@tempdima + \if@twoside\ifodd\@mn@currpage\relax + \kern\oddsidemargin + \else + \kern\evensidemargin + \fi + \else + \kern\oddsidemargin + \fi + \kern 1in + \endgroup + \fi + \fi + \kern\marginnotetextwidth\kern\marginparsep + \vbox to\z@{\kern\marginnotevadjust\kern #3 + \vbox to\z@{% + \hsize\marginparwidth + \linewidth\hsize + \kern-\parskip + \marginfont\raggedrightmarginnote\strut\hspace{\z@}% + \ignorespaces#2\endgraf + \vss}% + \vss}% + }% + }% + }% + \endgroup } % \end{macrocode} % +% \section{Packages settings, libraries loading, etc.} +% +% We gather here miscellaneous settings. +% % \subsection{Related to \Pkg{etoc}} % % TOC depth level is ×section×: @@ -4768,14 +5312,14 @@ Running "make install" installs the files in the local TeX tree. % % \begin{macro}{\printbibliography} % \begin{macrocode} -\int_new:N \l_@@_section_int +% \newcounter{lastpagearticle} \cs_set_eq:NN \_@@_printbibliography \printbibliography \RenewDocumentCommand \printbibliography { O{} } { % \end{macrocode} % We force all the previous floats to be processed no later on the page % following the beginning of the bibliography. % \begin{macrocode} -% \FloatBarrier% + \FloatBarrier% % \end{macrocode} % We automatically insert the acknowledgments (if any) before the bibliography. % \begin{macrocode} @@ -4801,6 +5345,7 @@ Running "make install" installs the files in the local TeX tree. % The independant articles contain their (local) table of contents at their end. % \begin{macrocode} \bool_if:NF \g_@@_nolocaltoc_bool { +% \setcounter{lastpagearticle}{\value{page}} \newpage \setcounter{page}{\c_zero} \pagenumbering{roman}% @@ -4810,8 +5355,26 @@ Running "make install" installs the files in the local TeX tree. % We don't want the article's title (chapter's title) in the (local) table of % contents. % \begin{macrocode} +% % \group_begin: +% % \hypersetup{bookmarksdepth=-2} +% % \etocsetnexttocdepth{subsection} +% % \etocsettocdepth.toc{chapter} +% % \tableofcontents\ref{\l_@@_localtableofcontents_label_tl} +% % \etocsettocdepth.toc {subsection} +% % \group_end: \etocsetlevel{chapter}{6} \tableofcontents +% \afterpage{ +% \pagenumbering{arabic}% +% \setcounter{page}{\value{lastpagearticle}} +% \addtocounter{page}{1} +% \checkoddpage +% \ifoddpage +% \newpage +% % \else +% % \setcounter{page}{\value{lastpagearticle}} +% \fi +% } } % \end{macrocode} % \end{macro} @@ -5001,18 +5564,6 @@ Running "make install" installs the files in the local TeX tree. \ExplSyntaxOff % \end{macrocode} % -% We get rid of useless overfull hbox warnings (due to ×fleqn× and -% \Pkg{autonum}) by telling autonum to ignore overfull box messages when it does -% its tentative math environment in order to establish some internal values (see -% \url{http://tex.stackexchange.com/q/205393/18401}). But this patch works only -% outside ×\ExplSyntaxOn×/×\ExplSyntaxOff× -% \begin{macrocode} -\patchcmd{\autonum@saveEnvironmentSubcommands} - {(0,0)\begin} - {(0,0)\hfuzz=\maxdimen\begin} - {}{} -% \end{macrocode} -% % \begin{macrocode} % % \end{macrocode} @@ -5237,6 +5788,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{ie}{i.e} \ProvideDictTranslation{Idest}{Id~est} \ProvideDictTranslation{Ie}{I.e} +% +% For the note in the margin notifying when the equation continues next page. +\ProvideDictTranslation{equation-continues-next-page}{Cont. ~next ~page} % \end{macrocode} % % \begin{macrocode} @@ -5296,6 +5850,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{ie}{c.-\`{a}-d} \ProvideDictTranslation{Idest}{C'est-\`{a}-dire} \ProvideDictTranslation{Ie}{C.-\`{a}-d} +% +% For the note in the margin notifying when the equation continues next page. +\ProvideDictTranslation{equation-continues-next-page}{Cont. ~page ~suiv.} % \end{macrocode} % % \begin{macrocode} @@ -5355,6 +5912,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{ie}{d.~h} \ProvideDictTranslation{Idest}{Das~heißt} \ProvideDictTranslation{Ie}{D~h} +% +% For the note in the margin notifying when the equation continues next page. +\ProvideDictTranslation{equation-continues-next-page}{Weiter~ nächste~ Seite} % \end{macrocode} % % \begin{macrocode} @@ -5414,6 +5974,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{ie}{d.w.z} \ProvideDictTranslation{Idest}{Dat~wil~zeggen} \ProvideDictTranslation{Ie}{D.w.z} +% +% For the note in the margin notifying when the equation continues next page. +\ProvideDictTranslation{equation-continues-next-page}{op~ de~ volgende~ pagina} % \end{macrocode} % % \begin{macrocode} @@ -5604,7 +6167,7 @@ Running "make install" installs the files in the local TeX tree. \RequireCitationStyle{authoryear} -\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict} +\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict,pagetracker=page} % \end{macrocode} % @@ -5652,8 +6215,7 @@ Running "make install" installs the files in the local TeX tree. % ×cite:title× defined in ×authortitle× but not in ×authoryear×. % \begin{macrocode} \newbibmacro*{cite:title}{% - \printtext[bibhyperref]{% - \printfield[citetitle]{labeltitle}}} + \printfield[citetitle]{labeltitle}} % \end{macrocode} % % Because we want to replace autocite redundant consecutive citations by @@ -5680,13 +6242,14 @@ Running "make install" installs the files in the local TeX tree. \usebibmacro{cite:label}% \setunit{\addcomma\space}% }{% - \printnames{labelname}% \ifthenelse{% \iffieldundef{labelyear}% }{% + \printtext[bibhyperref]{\printnames{labelname}}% }{% + \printtext[bibhyperref]{\printnames{labelname}% \setunit{\addcomma\space}% - \usebibmacro{cite:labelyear+extrayear}% + \usebibmacro{cite:labeldate+extradate}}% \ifthenelse{% \iffieldundef{labeltitle}% }{% @@ -5743,13 +6306,14 @@ Running "make install" installs the files in the local TeX tree. {\setcounter{textcitetotal}{1}} {\stepcounter{textcitetotal}% \textcitedelim}% - \iffootnote{\usebibmacro{nwejm:cite}}{\usebibmacro{textcite}}} + \iffootnote{\usebibmacro{nwejm:cite}}{\printtext[bibhyperref]{\usebibmacro{textcite}}}} {\ifbool{cbx:parens} {\bibcloseparen\global\boolfalse{cbx:parens}} {}} {\usebibmacro{textcite:postnote}} - - +% \end{macrocode} +% +% \begin{macrocode} \ExecuteBibliographyOptions{autocite=nwejmfootcite} % \end{macrocode} % @@ -5765,20 +6329,20 @@ Running "make install" installs the files in the local TeX tree. $pdf_mode = 1; $bibtex_use = 1; -$bibtex = 'biber %O %B'; +$bibtex = 'biber -U %O %B'; -$makeindex = 'texindy -L french'; +$makeindex = 'texindy -L english'; add_cus_dep('idx', 'ind', 0, 'texindy'); sub texindy{ - system("texindy -L french \"$_[0].idx\""); + system("texindy -L english \"$_[0].idx\""); } push @generated_exts, "aux", "idx", "ind", "lo*", "out", "toc", "acn", "acr", "alg", "bbl", "bcf", "fls", "gl*", "ist", "run.xml", "sbl*", "sl*", "sym*", -"xdy", "unq", "mw", "*~" ; +"xdy", "unq", "mw", "*~" "sta" ; -$clean_ext = "synctex.gz* run.xml tex.bak bbl bcf fdb_latexmk run tdo listing" +$clean_ext = "synctex.gz* run.xml tex.bak bbl bcf fdb_latexmk run tdo listing sta" % \end{macrocode} % % \begin{macrocode} @@ -5803,36 +6367,28 @@ $clean_ext = "synctex.gz* run.xml tex.bak bbl bcf fdb_latexmk run tdo listing" #include:tex #include:xparse #include:l3keys2e -#include:l3sort #include:nag -#include:fontenc -#include:inputenc -#include:fontspec #include:graphicx #include:adjustbox -#include:draftwatermark -#include:xspace +#include:tcolorbox #include:csquotes -#include:biblatex #include:array #include:booktabs -#include:varioref #include:mathtools -#include:mathrsfs +#include:ntheorem +#include:rsfso #include:esvect #include:kpfonts #include:translations -#include:fmtcount -#include:geometry #include:babel +#include:varioref +#include:subcaption #include:tocvsec2 #include:etoc #include:microtype #include:datetime2 #include:enumitem -#include:pagegrid -#include:amsthm -#include:thmtools +#include:biblatex #include:hyperref #include:hypcap #include:bookmark diff --git a/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf b/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf deleted file mode 100644 index 9b990691e19..00000000000 --- a/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf +++ /dev/null @@ -1,317 +0,0 @@ -%PDF-1.5 % -1 0 obj <> endobj 2 0 obj <>stream - - - - - Adobe Illustrator CS5 - 2016-07-01T11:20:37+02:00 - 2016-07-01T11:20:37+02:00 - 2016-07-01T11:20:37+02:00 - - - - 256 - 184 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAuAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVklxBGeLyKrH oCQDjatLcQMCVkUgDkaEdB3+WKqhNNz0xVwNdx0xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV5h+bF0yatBAkEVwW06dmDwm4mUGaJOcESlSXHPrXY VOY+aNlw9UL6XsfPuUdSign0rQxcCGaN9PX1rW4vxp91KAY2FQXAO4rICOu3fLYfSHJxfSPchm0y 0kkgf6ra3KtFyKR600RjDhS3J/VkL1Jbiw6UP82TZsr8ky31pdfoqS0tbZWjknuRHqH1ub1FMcKs ImHJEfgxO7UPetcVZnirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVUJ7GznkWSaFHkT7DkDkPkeowUtLJ9J0qfj69nBNwBC+pGj0B605A9cKqP+HtA5cv0 Zacv5vQjr/xHFUTHYWMU7XEdvEk77PMqKHPbdgK9sVV8VdirsVdirsVdirsVdirsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVdirsVdirsVdirsVdirsVdir//2Q== - - - - - - 1 - False - False - - 419.999514 - 297.000132 - Millimeters - - - - Cyan - Magenta - Yellow - Black - - - - - - Groupe de nuances par défaut - 0 - - - - - - application/pdf - - - PaulPainlevé-logo-cmjn - - - - - proof:pdf - xmp.did:04801174072068118C14951806C0E8B9 - uuid:469d09bb-a317-284a-afe1-29b99da83110 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - - uuid:7259676c-0c82-0e4f-9077-a7135f0a57a2 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - proof:pdf - - - - - saved - xmp.iid:04801174072068118C14951806C0E8B9 - 2016-07-01T11:20:32+02:00 - Adobe Illustrator CS5 - / - - - - - - Adobe PDF library 9.90 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 3 0 obj <> endobj 5 0 obj <>/Properties<>>>/Shading<>>>/TrimBox[0.0 0.0 1190.55 841.89]/Type/Page>> endobj 6 0 obj <>stream -H\Wl +̹z?R'vX؀,"M7䏿q/ӟ>~Wb%c^뷏pz;^Ǐ=\3xZp%_.%Ϗx2x.3+q3!5녗ǿ7 8UtxzWoҸ$L W.+M]2A0(؍rMr{,Cm΄|!"X|fxR"*$d. -FAD8~ ~ 5p.wnUdo _Pj^8g')="e OvkQ6m1n>8/>ۻ+qHddD9C1KO!IOJ4E3Mƕr&Lg퓕 L!sΓ4w"~X4K b:-[ M(5k2:(,_o,V3Iq**FT tHڟ1vA 7U Q,4{3Fl:/=Zs^xoZ 9`3@d7JL7A1V܈I8mRbq|QO, Qd49 <_!fY(3m!>q8!tx5#Fz>Q7&En\)x w90 #;9=$eÆvsXSpTA[!n[u2>M0Y9p5\'>}Xܨq(50`[@~3g`;a 6kQ@Va^>ǐv¡0}<>$l Kl+)'%JħBB \ZY2$ f4DŽ;sցg:r Lfݚ@֥l[zwKT9f6 -UmRtZ33Jtp=JdWԗT8G!XJgMNǎ8{hBb5C5RXJ%0ROniz҂,Yî5 #Rp׼KgV=@Mc+5ĂZ:Xc27ŗ2Rߝ]lZ"Sk3HrD!VX-aD| lQZMȜ<5GB*XsLM-&iRyf)qp)/}7% [;}DX|/eC:g`^C`SPi-_2g9i>/O}ԏ)589K9GF&Q"fit.4f-ΖyAr˥0o5{d-|r|M3۽Nf @02 &+J  dIOYEwi~3}bTbL6fZJ9,aVC7mSKjNɣQYBxjasTHEu*Y#}I,ASq4*F8-41!4_K݈fڣd& t;74V➍v>#l4@a*X*71:lKPJmTG9H^Nyxj*s\oFqAWoq6٪BfDZƼ - redUWp9,Mhݣ+i)U_r|b$q}IisLR6S+K\&$x }Y0>)?X]2|[~&Sb)j$J5ю3ZIUx힪b3'Z*Ǚ4c 9*˿>R3T䮦X!Tiq!#FSCk)|s֡ܔ/LkX6\k -⫦׸n_ZGtt+.,tͪ@7zĔ8g2+ٙ^5 _UDz,`@j11yнDg[*uE$k'v)S!|de ud9\[=Nb<Zc5T76(fQi ò?:ݶxOG\W`YrKsde-(Iђ\nZgmd7K?^n(.7U+&#&G];DF*]b"ƵdEb'Z|hz"_yBUd Z5tqb d -G-bm%?rH1"\Rf^8'+ (6/AT\߉{~y8<h{_Jw6RM#Msi?)i}j -s/3'sǤj,=v1\k5 "<U5Fi&)mL HyްL/m۰cU1P^=jcB_R'\׿m|3E!_Rk48p}DMqӇ̟4b |5# u%:'} nYlR=Z@:V, `u;`2j&&. gwZǥ:֓ЫSյTJ2%<@95OdnYgAþ3h )5lO*3j\Ei%l7gvʪd\ޯ?m<}>FϷ>(Av<zRоpY6i`ASaR7#'M92uyԒWy3tɈ{-QGAmqG$BlyV*nn.o ƛulj\&zQV6 di>E2P $av*wE -d,'ݞ 5+(NVkLηd wR2uvXHڟ N+iV[\v:], h\H?VLXO%`נ9cͮ Ig\?xE7=iPBh -fxPOP^}k۬t~uŸWb W,ɲvאggbJ}t.t@$-MwJ#6yZP;Re5,O$t7Hj#@*1q{|3 "mb?kb~=R&n5mmKYc9l_ 0;^i35FNh7wۦ_mJIKz2 --+zo P;PhlS:Y[볏B=.Mz2F/0^*);f/Db xAE GVƒc R$DsnZW_5?gƟGv?5y5PvrWW?{IQ-pb _ZE7~B)}XE f@P$@U ěPkct8ۉo>,,AD/\)%"\(yDEeQ^Qia^Na3ɐ SJǻl,>0i8 ꭹ"Η?+ݢ3~W1"P[ߏ6%IWfz,n*Kr´ADAoZ ũ~w|?^G|dJ`TQWBݦTO@^sߵ;)<:DJ۸8*7##w -YJi(RllU5NC m#HCuhMFXqԡ[g㐏Ǘl؟V3g{%Ք7+"t]Wm>PZkUǿ _aspn4γ?: '!8tZ9d ;85%)1Yf #.fqmxB 7xOxKʨ?se_6Rg~C^B.uӾqv@AY<7GEbY KZlOw!N'Cw&WnU|S'PIT -5er-?c?f?=AdXM$a* -8*қ ԟ[*`:ov#U;ɯ0VeYf#o L20$p es':6, dq=W54!&?=MXVm'0P_|"Hxj6&W"[T1Yb- |4Wt/X < NE8GZ[Y,4]̝rs $C7W! - EHjKbBс+5.s4?L[Y٧##XN b:3qq3U SqS{.|. cT_Q;KHRWO.gS$ky6 |Z}MX]L ~4sm=LעpZU/X( 4oq]wg/ y>w²'la5zKѡtw=E 2XgAk"Wkj_O؍xun|$.#JhEFTݸLw3mWc;}I[ J!P7`;DM곓}{9Ÿr nwjA[F]&]M^٪3>.5.2TQ2?DZVv$g0xߧzJy#|d&U]F_(<$dhC}q >,PVQo6\_Қ8b$l]F0W%iJ=`7Ǹj-)v!j3̈Ov[h$DB"p0:gGҊYHR7DO]յn%ds﨎P akKTilŽvQȄڷ5[Ʃ,M@w:uns;"Fdeڀf6%H`yQKbTmfSr~fCgT -uuq -4/U {G-6rCco8ÞOcDTK. buZGe461%n46 ƵG0Z?/5 w, ->&I *K űu`re7#"sTm芮}9_7xm$Hv* eLk,LPт cZfO1ʍU7 .`BMAxd4v⎢ m]$ǘS'˞u QÞ#gxrGBJLːj8Q vޝz.5)`rp'ПA9j{T*uೠx <ݭI& "B3;|.R;$8ؙG \X!t>C~"7Dݺ@'5|h^43XW0B KxT' &AֺcD<s#m.cKf @wVwYٹREQ"#݄.p`/Vẓ-(m'ԁaԁ, N$)6- Dv喁oHH .3"$(ܙ̞D6E̖)_܌w.k /:!_ǽm*{KQva䙌5C$N; -=HO&J֮@@%F9r&#Lr!2<=`.c7#W I y,\- -p/#R&o/؉pQR -Ľ\326!YLe.]0&-OY66cr!tr4^ $p{b:Mj:G)R%[1cZ5TLz۬k׼=J/Yԍ_ڙgIP$%8OJ; W'Â1/ -A!jZj*#5T+s@l߉UΪ]pmCk."Tq>ԤQ {^H'{`QORL*G VRS-@Ba'?8~•Jea0˹CNO@ > HwZF?VnTw}?71Z7b ĉ]#9U}+W:ᠯ=贚_T."E9SkvE^ w"fSCm|i|\Ս;m ->IODqf}6#q2':~'Zwڞe;΂C ~Jyhz^N,N=O6jʥ1hnMO߸OHl0"m${+1 65|U~U!Wbϔ> ,l9?c)8XA^6wZ' -ﱈ -BqKNkOqk߮z^L_8V=̀SDc% :nh@s hE%[_h\d vH d0C_8 ҭjʺP X `_z-J]Ϥ1wZ_|j%Yӫu{2 } 2?]Ge6iS|(({w/*VdaNKqƞUGHHZsabrCqb<-O7EbX<ղEuR)k\oaTj 77Ɉ=?Hص1p2ʃaZR?c -C UH\vb hIS`꼢U0y]!m}"-vVnOPיmCڑkkq1. ̦l]dƎ)KB6.R>o˵zvDݥ ?;C>Ys*52h?@S>ߖXN&p>8 jSY">)̛5(EM%BmXT+d (2 j19}plnJ6_[^'[O]1Fa+JǷ듃['QR0H " mv0+svNH\c -H\q%qTZ̤qK'W Z&QQeUws9`A(\iJ -NM=4MDUzzfiZ(۔#$Yz6Mvok,~Qp 혚)#l+:]-Y lUd/z2ɠi;'t0!emhwM3X -!Q*HadU5)%t23T i?cA%읎8M fGQȔ7ozmA|.ŦkȂfԸK)ʂBR ͑C {~di<(nB3x#w}_8e9]2 -PW5! m!KDÝg×W3#)%M f+{Ԙ¶B [9SVc- -q uY~BjXIni/HM}􈏆@i_Y]5xE|°0L)uF'@8qzb⋎Qq5*&]m u\&`w2sa7P@QI 7 -cjڊ=r9^; Rq(ban )`YV%?%6̀d6GU)nWɭѩ" GD%lt?O`J:(wQa7a)C9S>Yܒ({PhRdC>%&<*bS:7I -i -tB0WA1p.mX.ʠ_<5fL_\ZLч"d{w6ʅoJa1"! - ָM9[;YPb%c95ȳ}%h0ז?l͐9QHx}]E/h;:y'ؚHBWZn["&mrL -yj$s9ݷJ"L?/}ƌ ~koNe#nND*Q"dlKZT8LjnfeӈP bâOf|a Cr/PMJ*(ap[Sܟ[x9RF p ^`hsM,;5#r4Mȧ}E F4HXi=ս~}Lcvw)>r5*e@G ~YséZ|\Ox~2/.cFOJ@ohT Lѩ5*I/V\HM×|Aѫ9 -螺09*gu-0KQ;dn&Rϫ\U&*EV ̞

|3teoR8s0k! -;T1"Sbsk2;-hǹ/}d-h?~<_]p%lLn mo."'UF7_HgBᷖ qaΜ&Q+tp1]vWGCa%u2L1>y%[i6˰#X-XPj8e:l~V:P1z1F[gx0|,*m(ѵE4Z=0Se!E6Ă vdX&({0coy@&EWRXܔRxSJ(w|3A>S'/[COjR4)/*ondLIs #GycXo) QqNt`z)7:l8 !;DD<C_6#[+ObD҅ _l25tlf%S̸1R:=+uh.Ս?ux}5Vٌ2dZVR8qgcИNpmy0= YOHQҾË}[k~ovL3b mBxtBiB9j,dx@?9^@ /rj9]*o!G4PTBza̋.)@t` -e*t^jjt1G8M恇 -rEEIqHBƏ'T6bL:!oa<A-cQnLNxq m=.nm^3ȭ![%e]*F5+u/t1qQ{_g׮䧌^eLyhnv M%bԥBa|^O6뇭r:&&enj˖ mD۸МV?b:]ݐJߺ=^M) lV$GgjVRhcumVtBϨussЀc^~# y:)eNV*AC3b -ն%YXUn*FO#tap~IU:r@kPQ<|Ga좩y|Qdm4C9˒‚G|ǖ/{ޛJe/&u^EyvmZ#rU¦@23K?mU{`Y~M^jϲIFQޡSj@-~E]ĕЬli>5(Y}шx8#׫4[yuhQELiE@>k%y6^`ݙnTe>#_4g:$ ]WSMNt8A^ea˼ܠ=n1dp܍S m5:E@>X2{PI)3Wrw6NiLJxYu۠߼ˋX.L;")PK՜KArPTbX\<%v /= Jg&vG'd>TD)a:N||y{HvT'3,EǐDMRWj*m?[S )AhuYmJJ ɶE6Дg<%x.o2nk#dfb+`HiK~*wr'vw)Mޑ1d>^8(Z9SR@C'4#Iָ߯Sn -tT5pZ53"&kbӐXE;)~su^|Sb./N}ͅױ -iOd5Y#9/4BK'oUP»TS&vM,fۿ!F#U-"C$|R;[)hG۴d,cŦM ɿ2KڰDkLݛa-y(L)ڇ/L˵'8<5 $Qok׍S Dy+ˇ2,G˟T-3@ޟg;+u㤌auE b:O<ڴF~HyoU -hD#uġc…6uZֿd|GiD)@Nt:\6աU'gTe?(9־2cQ7AXjۧln㢔_ -ϻnhb-|ߥn)JZrZZP7""{5:;ܴIq^ - _r?Ka m=FQ%ѝ`-]> 'mIL,a_p'bQB ]G08!7(Șb1Yh^>ޥY 3uUtiK[>H -'6SԆ«ؠd_[iCl' -ٴtnJt.rR\62VNIA1=z{K xPr6WI򏧽}nz;ֻ`6ázj\Xb c%bjII\xa5-G탺Ѩ`(ghjI b|bPtbJlW riRɰwt]]777m-Ž.)F6VAɢx?+iʶAaHLOɆK+ٰ!k>XKD EdѦolz .rϓf#A:º ri{F4mBs@y;WhT%)&/(?yۉN{uaGv\gȾUF`"d/9axSQU1=89:$52(C_m'2m;0oŊC99\] @U~Qjvt+蛷{QaP)}pk["A(/X<ҙtv1dy,{%lbJo$%mj)ECP8RǑ n}NDp/pK)ÛXR(8VAX4[ -ʆEgè.XFKm (G΍@Zyr93CT`bʁp8G:g;4 fR9E -ycL/d_908N6L jV WhM DPCE«EtnCk!)$8 -cLɲ ~*ΪB~=963ɧ#|s/g* -|/,Dpx;CkS8d3PY g[j<Z*Ĭ#`VV#UAg(G&5 o"Qn-KT145xFwx S=8e1t_w;_FBDݝC(r#G3TCfË́l0-0a(-1 -C$Eɼ Z-|鳟̳S>EG#ДxQ~MҹʡRߡ_g($eG§Yg6tZO~1 j6~?o2q ^hR_B놞}&f8 7;v@f!s]샏.ՁA*PCP8/Z< @&2eDھ !ocqlYS}x~ -\u:C]1#%+X-;_"x^O _0oWiAg3ĘLjѯ@(3Kγk2yɩʡ;$Xg"$M*3IZ0byln/x"jI,e3hሮbL/IɎgZ~=B&d׽`򧬊<|yuC* -T) -y++;|v3~ŝ> Mݿ@w_5wp",,*6 veAB_s@IHo#';Eif'<,!GC7tO4L/u. "0!Ꙧ(^<1tdD4A&L\%,SMlFDu5![ - ێ -c]GR%uvLLomˌ-6HԿC`$p+:@KSͩ,V`,zq{ xw6nm]R'ӚYtbvlmHS P$ }2ii`6ƣ !488Dq*w(e5;}HHoCtBO[lβaVjpVY?t8:b8Hv:^cu߼nWzJo`'+ endstream endobj 8 0 obj <> endobj 9 0 obj /DeviceCMYK endobj 10 0 obj <> endobj 11 0 obj <> endobj 7 0 obj <> endobj 12 0 obj <> endobj xref 0 13 0000000000 65535 f -0000000016 00000 n -0000000076 00000 n -0000009912 00000 n -0000000000 00000 f -0000009963 00000 n -0000010340 00000 n -0000030969 00000 n -0000030573 00000 n -0000030714 00000 n -0000030741 00000 n -0000030836 00000 n -0000031081 00000 n -trailer <<8FE733E04F504FEB9047877C524FDCAB>]>> startxref 31293 %%EOF 2 0 obj <>stream - - - - - Adobe Illustrator CS5 - 2016-07-01T11:20:37+02:00 - 2016-07-01T11:22:37+02:00 - 2016-07-01T11:22:37+02:00 - - - - 256 - 184 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAuAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVklxBGeLyKrH oCQDjatLcQMCVkUgDkaEdB3+WKqhNNz0xVwNdx0xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV5h+bF0yatBAkEVwW06dmDwm4mUGaJOcESlSXHPrXY VOY+aNlw9UL6XsfPuUdSign0rQxcCGaN9PX1rW4vxp91KAY2FQXAO4rICOu3fLYfSHJxfSPchm0y 0kkgf6ra3KtFyKR600RjDhS3J/VkL1Jbiw6UP82TZsr8ky31pdfoqS0tbZWjknuRHqH1ub1FMcKs ImHJEfgxO7UPetcVZnirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVUJ7GznkWSaFHkT7DkDkPkeowUtLJ9J0qfj69nBNwBC+pGj0B605A9cKqP+HtA5cv0 Zacv5vQjr/xHFUTHYWMU7XEdvEk77PMqKHPbdgK9sVV8VdirsVdirsVdirsVdirsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVdirsVdirsVdirsVdirsVdir//2Q== - - - - - - 1 - False - False - - 419.999514 - 297.000132 - Millimeters - - - - Cyan - Magenta - Yellow - Black - - - - - - Groupe de nuances par défaut - 0 - - - - - - application/pdf - - - PaulPainlevé-logo-cmjn - - - - - proof:pdf - xmp.did:04801174072068118C14951806C0E8B9 - uuid:4e27f3eb-70b1-1e41-8861-b9e083adacc9 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - - uuid:7259676c-0c82-0e4f-9077-a7135f0a57a2 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - proof:pdf - - - - - saved - xmp.iid:04801174072068118C14951806C0E8B9 - 2016-07-01T11:20:32+02:00 - Adobe Illustrator CS5 - / - - - - - - Adobe PDF library 9.90 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 5 0 obj <>/Properties<>>>/Shading<>>>/TrimBox[0.0 0.0 1190.55 841.89]/Type/Page>> endobj 12 0 obj <> endobj xref 0 1 0000000000 65535 f -2 1 0000031702 00000 n -5 1 0000041538 00000 n -12 1 0000041924 00000 n -trailer <]/Prev 31293>> startxref 42136 %%EOF \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf b/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf deleted file mode 100644 index 3e580ad78c2..00000000000 --- a/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf +++ /dev/null @@ -1,249 +0,0 @@ -%PDF-1.5 % -1 0 obj <> endobj 2 0 obj <>stream - - - - - application/pdf - - - UL1-UFR-MATHEMATIQUES-CS5-2014 - - - - - 2016-07-01T11:03:06+02:00 - 2016-07-01T11:03:06+02:00 - 2016-07-01T11:03:06+02:00 - Adobe Illustrator CS5 - - - - 256 - 84 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAVAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXiP5tf m15v8seb30rSngW0WCKQCSIO3Jwa71zIxYhIWXpuyuysOfDxzu7PVhn/AEMJ+Yv+/bX/AJED+uWe BF2X+h/Tf0vm7/oYT8xf9+2v/Igf1x8CK/6H9N/S+bv+hhPzF/37a/8AIgf1x8CK/wCh/Tf0vm7/ AKGE/MX/AH7a/wDIgf1x8CK/6H9N/S+b3O88zapD+Uk/mhCn6Vj0B9TUlf3f1hbIzj4f5efbMSQo l47VYxDLKI5RkR8ix/zd+YPmHSvyDg872rQjXJNO0u7Zmj5RepePbrL8FelJmpvgaE98zfm/+Xfl jUZdN1vVxa38HD1rYQzyuqugcORFG/wcW+107dcVX3nnGzTzNpSRaxB+irzS7jUhaLBLLJPDGFcX EUyKyBFRvs/aau2Ko9/PnlNNB03Xmv8A/cTrEsEGnXAimPqyXR4wqECeovI/zKKd6Yqll3+cX5a2 nmU+WrjXIU1hZVtnh4SmNZmbiImmCGFXrtQvt3xVc35ufl6vmL/Dh1Yfpr6w9o9oILhiksZIYSOs ZRBtXkzAU3rQHFVvl/8AOD8u/MGuJoekat9a1GUO0CCC4SOURV5mOV41jcCnZvlirBdS/Om503yj 5M1JNYg1eTWtbjttQ1C20+7jifT1lkS49KJk5rKlFVV+025VTiqafmX+bMWja/p2i23mHTtBtrqB Lm8v7m3uby7jV2+FUt409OLktPinI69MVeq29xBcwR3FvIssEyLJFKhDKyMKqykdQQcVX4q7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXy9/zkJ/5MWX/mFg/UczMH0vcez/APi3+cUn/KfyXpfm /wA0PpWpSzw262sk4e2ZFfkjIoFXSQU+LwyWWZiLDk9q6yenxccQCbrf4s8/Mf8AJDyp5Z8majrd hd38t3aej6aTyQtGfUnjiPIJCjfZc98rx5iTTquzu2s2fNHHIRo3yvuJ73iGZD07sVfW9no9xrX5 LQaNbMqXGpeW1s4Xf7IeexEalvarZr5/UXzbXf3+T+vL73kHm/zB5n1L8k4vy5h8ma4PMNnZ2dne sbRjbKmmtG7SxzKWEnqCAcQvWu3vFxXoEWjXb/mV+ZF1LYyNBd6PZQWs7REpL/o8okjjYijb8eSj 2riqQfl3oerx61+XH12wuI4bbyzeW16ZYnVY3Z0AikLD4WIGynFUD5S8qeaW8zaB5A1DT508u+Rt Vu9XTVJFb0LiEfHpixyEUaRXuG5r2A9sVSLSvLHmGDUrryp5og12404a412umaVpcYgvg9x6sd3P qZYfuxWrLVeIFOvRV6T+Xel3Vrqn5oTXum3DRXmqzvDGIykl1D6J2hZ+AflUhTypU9cVYh+Wkvmr T/Mvl3SPLI8yx+XI3nTWNJ8xWMaRWcABKiO74rvz+yqnf7xiqWaPonmTT/yM8h3J0W+nuPL3miHV tQ02KB/rYtoLi4LMsLAOftr2716b4qqeb9K80Q+d/Nv1oa1b+XvNcVvOjaNpKXt1eQm3WNrJrhq/ VWSnGlN+pI7qvoPy5ZWtj5e0yxtLeS0tbW0ggt7ScgyxRxxqiRyEF6sqih3O+KphirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVfL3/OQn/kxZf+YWD9RzMwfS9x7P8A+Lf5xV/+ccv+U/l/5gJv +TkeOf6WPtD/AIuP6w+4vX/zy/8AJW63/wBGv/UXDlGH6g892J/jUPj/ALkvk7M1752Kvs7yGwXy J5dZjRRpdmST0A+rpmvn9RfNtd/f5P68vvYlqX51eX7jzZ5c0Hyvqdjqr6jqDWmqKheRo4liZw8T Kyr9oAcviGRcVk5/MnyEPMH+Hjr1mNaEgg+peqvP1Saen4c67ca1xVB/mP5x1Pyz/hf6hFDL+m/M Fho9166u3G3u/U9Ro+DJSQcBxJqPY4qmPmPWr7T9W0C1trmwgi1G7aC5jvTKJpUEZbhaen8Pq1FT z2pirz7Vvzh8zWf5eefvMkVtZG+8reYJ9H0+NklMT28Vzbwq0wEoZpOM7VKsorTbFXofmbz35O8r tAnmDV7bTZLqv1dJ3ozAEAsFFTxBO56Yqm9le2d/Zw3tlOlzaXKLLb3ETB43RhVWVhUEEYqrYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq+YP8AnIaNl/MRmPR7OBl+XxL+sZmYPpe4 9nz/AIP/AJxVf+ccv+U/l/5gJv8Ak5Hjn+lj7Q/4uP6w+4vX/wA8v/JW63/0a/8AUXDlGH6g892J /jUPj/uS+aPLfk3zN5kuPR0bT5bqho8wHGJP9eRqIPlWuZcpgc3tdTrMWEXOVff8kv1XTrjTNUvN NueP1ixnktpuBqvOJyjcTtUVXCDYtuxZBOAkOUhfzfVUWnahqf5Ix6dpxpqF75aW3tN+P72WxCIK 9viPXMCf1F85139/k/ry+95X5cvdNvJvys0fTtCvbLU/LlxHH5gMmny26QS/VTHIZZSgSs03x9d6 1O+RcVIPJmiz/XtP8qeb3uLe80/WjdT6dZaNK15eT/WGZLubUaMnoVavJP2BQdjir178+Uuo9K8p 6nDaXF5b6N5n03Ub9LWNppEtoBLzcIu53YD6cVS7zH5msPNvmbyHeaLBePb2GtuLtp7S4t+Aa1ej ETIh47/a6YqwjXdP1ib8u/zg8sx6XenVpvMU2sW0XoScZrOa9tnWSJ6Uf4IGYgdsVXefNUvbnz6n miNm0rRPMGix21jq17o02pSwOjyLLbxwU/czMW6MOLV8MVe1fldpemaX+X+h2Olx3UVjFb1iS/i9 C5q7M7tLF+yWdi1P14qynFXYq7FXYq7FVCXULCK4+rS3MUdyY2nELOqv6SEBpOJNeKk7t0xpmMci LANckA3m7ymssELa1YCa5CNbRm6hDSLJshQcqsG/Zp1yXCe5t/KZaJ4JUOex2VdM8y+XdVlaHS9V s7+VF5PHbXEUzKtaVIRmIGAxI5scmnyYxc4yj7wQqahremafdWNreTelPqUpgsk4u3OQKWK1UELs P2qYgIhhlMEgbRFlG4Gp2KuxV2KuxV2KuxV2KuxV2KvCv+clfLEzHTfMsKco0X6jeEfs/EXhY+xL MK/LMnTy6PU+zmpA4sR94/S8i8pebtY8qauuq6S0YuAhidZU5o8bEEqRseqjoQcvnASFF6HV6SGe HBPk9K82/nfpnmv8vdT0a7spLHWJxB6XA+pA/p3EcjUbZlPFSaEfTlMcJjK3S6TsWeDURmDxQF+/ kUXqX/OQdnpej2uleVNNXnBCkZurheEKsFAb04UIJ37sR8jgjgJ5tWLsCU5meaXM8hz+bxjUb+61 HULnULt/UuryV57hwAvKSVi7mgoBVj2zJAp6bHjEIiI5AU+x/IP/ACgvlz/tl2X/AFDpmvn9RfON d/f5P68vvY/5G/NG68z+btb8u3OgXGiy6PFHLyu3HqyrKxCn0Qg4AgVB5muRcVrXPzTGm39/ZxWd tK1rfWunxzTXwhhBuUkdpbmURSpbqhhZAKsxagKrUVVW3X5pXMVxKkWmQSQ28WoyzSNeOrEae0qg RBbd1f1DD+0y0rtyxVT0383BqGo2tkumJZNMbtZ11C7FtKrWciQvDFH6b+tN6slCgYAAVDGoxVFe XfzKuNVvdBtLmwtraTW4p5qxXjTen6SlkQKbeJ2ZgrE8lRRT4WY7YqzrFXYq7FXYqkvm3zjoXlTT BqOsTNHC7+lEiIXd5CC3FQPZT1IGSjEnk5Ol0mTPLhgN2AWX5w3vmC4C6bbfUbNjs8hDzMPH+Vfl v88mcdO4PY8cQ9Z4j9j0bQZHktebsWc0JYmpOVl0+pAEtmO+btH1w+ZYNY0+wbUYTpd3pskMMkMc iSTsro59d4lKfDQ0NR4HJRIqnJ0uWHhGEjw+uMuvS+60p8leQ/Mmk6wklzcy2dvBpen2zNbG2eO4 lt+ZlicSpJIFFacl4E12PhKUwfm36zXY8kNhZM5He9gao7ED70v8heVtd8rX3lufzBw9FrSbToUm nto2srqaZpFjj4MvridRsBzYH2wzkDdN2u1OPPHIMf8AOEtgfUAOflw/ALPMnl/ztJ5niu5ZHWVd WmbSL+e7iWzSGW1KWscVs0vL1VkrzpFybxOAEUnT58AxUP5g4gAeKxL1G65Vy32ZN+XGl+crGS7P mGa7b1IoR6VwySxCZARI8MhvL2T4+pBSNfBR0wTI6OF2hlwyrwwOvLu6WOCI+2R82cZW6x2KuxV2 KuxV2KuxV2KuxVDalptjqdhPp9/Cs9ncoY54W6Mp+X4HCDTPHklCQlE0Q+dfO3/OP3mLTbiS48uA 6rpxqyw1VbmMeBBoJPmu/tmVDOOr2Gi7fxzFZfTL7P2POrjyr5ntpDFcaRexSDqr28qn8Vy3jHe7 mOrxEWJx+YTjQvyr8/a1KqW2jzwxN1uLpTbxAePKQLy/2IORlliHHz9qafGN5A+7dlOtf846+c7G xS4sZ7fU5gtZ7WImNwe/pmTirj7j7ZAZw4GH2hwylUgYjv8A7Hv3kq2uLXyboNtcxtDcQadaRzRO CrI6QIrKwO4IIocxpncvJ6yQlmmRuDKX3sR8uaVqkP54+b9Sls549OudO0+O2vXjdYZHRfjVJCOD Fe4B2yLjIx9V84XN5rNslsIFg1K1htWksJnSS1knjikl5NwSTgj8+SsaBdxTFUZ50uPMti81zo9u l0kWm3tykH1Rp3a6iMYijDIa/vfWY8QtW4mnfFUlm8z+d/rUoi04uY7KKezjbS7v/SJ5HZJ63B4L AUAUem8fIjfcdFVFvNH5lwXtokHlqNrWSObmUhkVop1e/wCCEniPTlW2t/j2oWHZ1oqr+XfOvnyf SfV1HSZnvJINQNjXT7u09ee3S2a2WaJzIbYPJJNGPUYcgnIHFUBpnnr8z5W0P6zo0ptLu8liu7n9 GXUMjRK1uF5wPIWtBSWb95LVT6YI60KqJi85/mKbPUZJtNeK5gsoJrOE6fesHnkSEyL+7R6lWdwF rUEbigJxV6RZPO9nA9wOM7RoZhx4UcqC3wcpOO/bm1PE4q85/Pjy1rnmHQdLsdGs3vLn68GZUoAq +i45OzEKoqepOXYZAHd3fYepx4ckpTNDh/SEP+Xn5O3Gj20UuuXKtcAA/VbepUf60hAr9A+nBPJZ 2bNf2wMhIxjbvP6nqMMEMEYjiUIg6AZU6KUjI2Xm/n/y35n1Tz7pF3oLtaXNnYTmHUJEk+rLI0io 0cjoDQtE70HjlkCADbt9DqMUMEhk3BkNuvLp8aYxYjz55W8qfo/RLPVFuI7rUHicW4kSQJKPT9SM 2l1KxkXdTyjU7/FXJ7E7udPwM+biyGFVHry23r1RG3+cfJuTQvM0utH1odSWa48z6fqDcLSsCQtD 8dwsvolKxM3AhmIFPiWtTjYr4KM+IQ24dsMo/Vvd8qvrz+5GXGs/mtKLEzWzxPaCdoNQmsJJHedL l4x6sdvZXbqHtqf3axV5V59sAEWuOHSC6POtuIcuEHYmcf4u/i9yYNqn5ovelRLfRwzXGtRfDZQ8 YorRPUsHUtAf71vgBYkOOm++Co/c0+FpeH+GwMf8R3v6uvT7FjeYvzMnv9CiW21G3F1+j01blbIY AtzFS5kRfqbGIxPu3qXHwt+wVw1HdP5fTCM94muLh332O38W9+UfjaQaHD590Xy/piaVp11JqdjY X8ci3WnrW3l9dCscExgR3Uxs0igOwdtt6UBlRLl5zgyZJcchwylHlLmKPMX8DsKTnTfN/nh9YmSG 6vtR0qz1GS2uGawT6yInsucPqwxW8cifvzueAp+1tgMR9jjZNLg4BYjGZhf1bXxb0TKuXn7nWvmL 82y2km6Sa3Rra2lmaSzmZZZDI31hJ47ayuXjfjQKOUQHX4sajustPpPVVHc/xDbuq5i/9l8GT/l5 qfm67u7+PXvrUyRKphu5IDa2rl3Y8YYZrSzuVKrQHk0g/wArIzA6OFr8eGIj4de67PxIlKP+59zN 8rdY7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqoW 9jY20s8tvbxQy3LepcyRoqtI4FOTkAFjTapxtlKciACbrkr4sXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq//Z - - - - - - uuid:00b048e2-6ee4-fc46-aa5a-04f0ab81e8a9 - xmp.did:03801174072068118C14951806C0E8B9 - uuid:5D20892493BFDB11914A8590D31508C8 - proof:pdf - - uuid:899818cc-5ae4-5840-b293-910c4f0a8dc4 - xmp.did:0A801174072068118083F68E64D14A1A - uuid:5D20892493BFDB11914A8590D31508C8 - proof:pdf - - - - - saved - xmp.iid:0180117407206811822AC81757AED2E9 - 2014-11-26T11:11:34+01:00 - Adobe Illustrator CS6 (Macintosh) - / - - - saved - xmp.iid:0A801174072068118083F68E64D14A1A - 2014-12-04T14:49:05+01:00 - Adobe Illustrator CS6 (Macintosh) - / - - - saved - xmp.iid:03801174072068118C14951806C0E8B9 - 2016-07-01T11:02:58+02:00 - Adobe Illustrator CS5 - / - - - - - - Print - - - False - False - 1 - - 188.463604 - 60.000472 - Millimeters - - - - - Verdana-Bold - Verdana - Bold - Open Type - Version 5.02 - False - Verdana Bold.ttf - - - - - - Cyan - Magenta - Yellow - Black - - - - - - Groupe de nuances par défaut - 0 - - - - Blanc - CMYK - PROCESS - 0.000000 - 0.000000 - 0.000000 - 0.000000 - - - C=0 M=0 J=0 N=100 - PROCESS - 100.000000 - CMYK - 0.000000 - 0.000000 - 0.000000 - 100.000000 - - - C=30 M=100 J=25 N=0 - PROCESS - 100.000000 - CMYK - 30.000002 - 100.000000 - 25.000000 - 0.000000 - - - - - - - - - Adobe PDF library 9.90 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 3 0 obj <> endobj 5 0 obj <>/ExtGState<>/Font<>/ProcSet[/PDF/Text]/Properties<>>>/Shading<>>>/TrimBox[0.0 0.0 534.228 170.08]/Type/Page>> endobj 6 0 obj <>stream -HWˎWtLfq>>l ^`{ ؿwD&Y]=XXCUE&>~?pzIҖՊn"z߯sן/t/o6ٖ֫--wVe+-_e3VZ[D8fdC#u(;J7 ѐR$iL|JȚSwG{xo5/HVW й=NG6Dmݥ0qwIܖ w5Z#_,BY@A){D-V+wO(qt)BSnZW=k7a> -[cԩLs_TJ~cᨅE890m-y7nl0Fni#Rs^y -{̼EѝS^ -(9^c] -!WZ4S5.=AGqXފw;\:x=^x:?c&PNߐ%hROUAvP;sCw06(tX3N$P=N$JH$OA~:A52i~R?TABSѲ Qt%ER%y"l*gHGla ?Pϐݺ%: S)>õuW'2);4'' %OwD[*IstYHҽZc7X60);$< 8. =峝Ri@N1 swr=呅mqþe3k >7mg0џ 8ֹ//$ ^V{;αcr -~1z~=z~9D_N/珢Out LEяp*w@颤!S xS1ѩgS'Bk`Ft#ztK7Tm֬Z,I'RTm&J(2Bn -$OIϵ[J:%qzpy5N}:{!:kn^c~ѣ:trh^,zu#8`qrp|6A46p\%ثxD@?+COJCv}0Ά.ٴ?[nOhcGk2xPr{ifi-Q^WnT&r2L'4WgC:R_ @6\`jgXOK0tfT,~K|m$ aPb=OVt1.Yչ/[BoȠfvJ69nLLfs`pZPr"8)@LFfwuaFEpY tRrM-WM_dC]2Od =%pCǟD+:Yr"xrGR0p {a x f >Yk;v2Zʂ-YoU[i-|m?sܟT_;Nu-*KZ'149׳РǚI5p5L}:yӛ -٠o!!hf$??%_G[\W5!*9M%F^wj$ICV8iIRw$$^*T֮O>&C@/X|zΑaw",!9[Q *OH$ByU"Hb\VuF8I&1WE1nr7D,R"$ JCUuFꊢ0n3Ѳ!,`5X! b}IҶ'YrtG-]!2c!KN$imo⹩’IT`4TTAk铻 mn nP&ڪ|K-E --(.Rq`U'9|q,Mz RƋ i$L{ny{IVBt -)$.e^KꠍrYJ0a|c{>lo7}cdNe'{.ٿ >mz>q=>5vzٸ5TLs=m\W7>s^w~fz}ӎlD'Dgu'zKtwۉt;1=}ݡzI&cʍ}}۸o<'q;݋m>F,BW-oܜ6T`z[Now?:~YuEijӫKe-V>VH7(+W- O}v }k5r2Nѐfz3L>C%=ͭt%һhO-(=IeT\aվIπF]T<Ҧ& ]9C{Ԟ*qJM{n2j]|e⣵I&+N9 3]O'ms%U&2էh< ]ag{Bs60g^duhx RP9e )#lHpOW+J! -UCI4׭]' - - ION\ -Na ,G?gV>RX6(C[knmPԆ:Ԑįn;3$nɗfFG -yF狍0Z*k17f68!9<1rV%橊 3% &m`@1]ϬWX14E@ԃ:v3OBNɇ iGhtPrN&ƵIPÅ"T[a^>Q;F&]Yj3f6LYp;PD[b[[il8%:uwO oHAJYmt_ĄUcn-9%L|1R`F4$n|kYa sJb8+pa 9dڑ)fCdRc eϡl+L2eCdqԳw7H/&$'vN"]=Ѱ \hMO:.[q+n>1J.)}H֨*}:`˖/?x'察$gdZqH+bƘa. /?\xo]?ze- = s -ìp*aO᷿_]_\w?'+ӏ?_3_x}ݯ/` endstream endobj 10 0 obj <> endobj 7 0 obj [/DeviceN[/Cyan/Magenta/Yellow]/DeviceCMYK 12 0 R 13 0 R] endobj 11 0 obj <> endobj 14 0 obj <> endobj 15 0 obj <> endobj 16 0 obj <> endobj 12 0 obj <>stream -{2 index 1.000000 cvr exch sub 4 1 roll 1 index 1.000000 cvr exch sub -4 1 roll 0 index 1.000000 cvr exch sub 4 1 roll 1.000000 4 1 -roll 7 -1 roll 1.000000 cvr exch sub 7 1 roll 6 -1 roll 1.000000 -cvr exch sub 6 1 roll 5 -1 roll 1.000000 cvr exch sub 5 1 -roll 4 -1 roll 1.000000 cvr exch sub 4 1 roll pop pop pop } endstream endobj 13 0 obj <> endobj 17 0 obj <> endobj 9 0 obj <> endobj 18 0 obj <> endobj 19 0 obj <>stream -HVTG!6lş ؈MH,Q1vEAAb%APEł={#OE7YWn`lٙs{g|ɐޭg1+m%C#ﷸ8`k¨XK7`lâ#uxTZL ;q6P%GW -8>S5Pݫ[DdlCԺ3`scdTpP޶ɀk}A V>b:D룂"C}rjtTLlf~1jS+Bh`mXiP42 y` QZMZ:,mQ] un)r.3֕K}Z!6(Ӏz?5+5QҘwrJ`UbUT^f-[us]L 6nǷ-Z -x_o۵Q;un{|ڳg?ӷ_ !aÆ9**zرq 'M8iӦϘ9k/Xh˾2y_WĪik֮Xac&yKmwܵ{}>po'N:}.^B+W][ wYRHOB &rq)ӹ$(RVOv\9_ ZU6XK&her-E[mrM!0٦ TϜ_vQw}t=@o $}R˥zQw.hefi3:@c10U1U7ٚMM3ý"b2g#,-KWO+Cƭ|- - wLWHʵ5%)$dmF۠ek{#[$4szToIoPH"b  9 -JX),-X _`ο)[-|NbGO/<-NO+^ܦE{O.Q8LO/|UԻ0dщ=ݜ–Ew~'09ټƬ*yXh`5''FG'z?z 0)-ىw%%IbY)I?hQ6l;OŗyK080!LN+HcS1m9&vbnvܰaU@`W.Xz4{L/47a8œeQhCœR D&R$ZYuU) `]u4k'i;QnH)at6b jҧJe)+j\,\z~ez,r.ߟT5Xu WI2x+`O2w0헄*;"H)H,}@$~)AaKoH2l5xbeRHvG~`=/+(Q ,j<#D3Yɰʛӣץf?%%h(vJ eU`o׫]YM,'E^DoH߳7!,(Iʞe+JV]"$6h2 {Xg]pRǷU-譛Tc;&w߼K -hJ쏑7&ڄ(f.,{aSxY&-t*SCl G7kR,L9:b?Ō^*Tyݳ9Q.Q bT^ Tl*k*5Ziu4(iv$ jh*j3M'3Ɍc)Z>{P!L:{{C[NTV_q$E'eT'O4lHxcST-¹HL*72OV82)GVQVEV *m~il O?Y%LUNCՃwcF32rȀ ?i??hDzG҃ӣgwˎ{pYx ?.ٙz -m\\=} 2{NK,L59ny4y%y@yuzN)goK_68\)};r5臏%'أx|!A =9CU-Hf~QKů^-!C()B 7/9? #X]K0w9#0s+r(3Ov4fSNEl ³ԥ7/&&6Fl_Sś&Qޢ- 4y/qP3Vl^s-{3SU{iڕJ :)Qb}93ӽhwƮ%4cr=Ȋd/S" -|%SkKc;~2YxOuG z6$2ϪJiiq.|wfS}~aKOЇEDMZj,2ht{7dsY2ViJ4#':ït6W25C+z*yco?N|`R`}ڋ1u"WJnJ'E"Z_} ii#=Ӭm[ -Σ#)F#'c;ZIC`]gƻM&=}Uׅ4^'XHr7JfX`4QD )7%GYm W7-PwRi\LLiOgD%-zU\5v~[`0w{\n:^{QG O4I;I 2Zͤ,=`l$>>ޣԗ.= `+Sq.|>{?.j+ƈM>bq/Q<#?r'xBs9.|?L;\myl\nb%|JNȼl^Pބ=%8n9/}H| n7Z|k qר^؃@9KBk+@o}?=ϵ:ؖ!{fvOg6/#0#jXUyEũ7Я37$1ʞ1~K1F%y -9ꀓ3½~%{&d=b=E?WȂwq[;be;~gZ,se>2'l;Srʖ^ P.Zl c J߹oޥqv0Q VhX#mqC񟣭zUzj7h.4uG`|lE(6jۆ9>+rͶIʚƺ"u "agy}2Zu>[[DKvGn;~5s`ڶ<Y: -x@{q}j<97jf*ck[Y ʫ^͐J9 dƺoVH> Kӷjz[|>OE͓\.1RϠKX -F0V+H%5^c!57Z:µwH>*frq,28kQ˼NFq"e>+.ڠΑLXH^t/Wrak!_IF=cX;f^Q{Яɹ5>oyǵ4 8-hь9{Um"ރfp/f<śrguJeM3 ]֠ %C?éis8r=D/[u>@%@i+d(NmfӪG~lﺭI63"Ii&?U-s˼wo\sXKtLrZ9 A3N ^ \pGz_owvu.{_P9GX|!=6fVm5X;hiWnuyF.%{ЄMUzk?Ù2ؓb {CV\f2YԲ\_`:%;Os!frQ<W]LU>wfY0 "ދYEH,PRt-%Tİaذ $>]+(hV+E /j5mj|ҐF+Ɨ01iM~{sν;1hOr3L 呈$ 3*W#P2ׄJDOUi0A;j˰$%\="lVD \cDAVA# mAٞ{v?3plF~ӈj8#Cm\}fW+nt1s0EVw -j֌gu 9A?Z#5: -7Gz[Ɵyj9gN6ODŽ~<KYt94OWD1}*~2UDߛ6wQ.nwEPCNRHPobk0O} '\'8!E3nnqe_c[؍o~q"_}9zKǓnK'>+gQ ybJۘ^B^1z!goJℓ$}s1:ʎrOV&}t2VK' -Wƞcnv:i#o6Gz@{q~+GbJiA~%ʹҢJjKi^n%}JT<*lٚSYx, -ӜJ /x ;7lv:sYmr3Nޖ9]B\qvC ɇ_"q.@O:A't6yFH9]sу^ө&RNMN"#<^0EO.:hI^cJzCTUǘ2s 桠Pce;umtZy1ڿʙ`ؿa endstream endobj 8 0 obj <> endobj 20 0 obj <> endobj xref 0 21 0000000000 65535 f -0000000016 00000 n -0000000076 00000 n -0000018089 00000 n -0000000000 00000 f -0000018140 00000 n -0000018582 00000 n -0000023866 00000 n -0000033846 00000 n -0000024967 00000 n -0000023724 00000 n -0000023939 00000 n -0000024379 00000 n -0000024832 00000 n -0000024081 00000 n -0000024183 00000 n -0000024284 00000 n -0000024885 00000 n -0000025561 00000 n -0000025816 00000 n -0000033958 00000 n -trailer <<71EE748C7BC741868044126CBF28351E>]>> startxref 34152 %%EOF \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl index 2c3fe6c3d10..ea422625bfc 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl @@ -37,3 +37,4 @@ \ProvideDictTranslation{ie}{d.w.z} \ProvideDictTranslation{Idest}{Dat~wil~zeggen} \ProvideDictTranslation{Ie}{D.w.z} +\ProvideDictTranslation{equation-continues-next-page}{op~ de~ volgende~ pagina} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl index 56300b39dd8..3eae7b8fc2a 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl @@ -37,3 +37,4 @@ \ProvideDictTranslation{ie}{i.e} \ProvideDictTranslation{Idest}{Id~est} \ProvideDictTranslation{Ie}{I.e} +\ProvideDictTranslation{equation-continues-next-page}{Cont. ~next ~page} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl index bedf4510bcf..e940fea43ba 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl @@ -37,3 +37,4 @@ \ProvideDictTranslation{ie}{c.-\`{a}-d} \ProvideDictTranslation{Idest}{C'est-\`{a}-dire} \ProvideDictTranslation{Ie}{C.-\`{a}-d} +\ProvideDictTranslation{equation-continues-next-page}{Cont. ~page ~suiv.} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl index 0f381883717..1cfd8add9b1 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl @@ -37,3 +37,4 @@ \ProvideDictTranslation{ie}{d.~h} \ProvideDictTranslation{Idest}{Das~heißt} \ProvideDictTranslation{Ie}{D~h} +\ProvideDictTranslation{equation-continues-next-page}{Weiter~ nächste~ Seite} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx index d3504920113..82f0fe34099 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx @@ -96,7 +96,7 @@ \renewcommand*\bibnamedelimc{\addnbspace} \renewcommand*\bibnamedelimd{\addnbspace} %% -%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze +%% Copyright (C) 2015-2018 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 4008cb50241..bcedf42dbeb 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx @@ -17,7 +17,7 @@ \RequireCitationStyle{authoryear} -\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict} +\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict,pagetracker=page} \renewrobustcmd{\blx@mkbibfootnote}[2]{% \iftoggle{blx@footnote}% @@ -47,8 +47,7 @@ \footnote{#1}% } \newbibmacro*{cite:title}{% - \printtext[bibhyperref]{% - \printfield[citetitle]{labeltitle}}} + \printfield[citetitle]{labeltitle}} \providecommand*{\mkibid}[1]{#1} \newbibmacro*{cite:ibid}{% \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}% @@ -64,13 +63,14 @@ \usebibmacro{cite:label}% \setunit{\addcomma\space}% }{% - \printnames{labelname}% \ifthenelse{% \iffieldundef{labelyear}% }{% + \printtext[bibhyperref]{\printnames{labelname}}% }{% + \printtext[bibhyperref]{\printnames{labelname}% \setunit{\addcomma\space}% - \usebibmacro{cite:labelyear+extrayear}% + \usebibmacro{cite:labeldate+extradate}}% \ifthenelse{% \iffieldundef{labeltitle}% }{% @@ -111,15 +111,14 @@ {\setcounter{textcitetotal}{1}} {\stepcounter{textcitetotal}% \textcitedelim}% - \iffootnote{\usebibmacro{nwejm:cite}}{\usebibmacro{textcite}}} + \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, 2016, 2017 by Denis Bitouze +%% Copyright (C) 2015-2018 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 f5e4171df09..9ea63768715 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} - {2017/02/14} - {0.98d} + {2018/04/07} + {0.98e} { Class for the journal "North-Western European Journal of Mathematics". } @@ -30,7 +30,7 @@ \msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{You~ are~ using~ the~ `nwejm'~ class~ designed~ for~ the~ complete~ issues~ of~ the~ NWEJM~ and~ aimed~ for~ the~ NWEJM's~ team,~ not~ for~ authors~ of~ articles:~ if~ you're~ - an~ author~ of~ an~ article~,~ you~ should~ use~ the~ `nwejmart'~ class~ + an~ author~ of~ an~ article,~ you~ should~ use~ the~ `nwejmart'~ class~ instead.~ Otherwise,~ if~ you're~ from~ the~ NWEJM's~ team,~ please~ note~ that~ the~ issue's~ main~ file~ should~ be~ named~ `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~ `\c_sys_jobname_str.tex'.~ @@ -77,6 +77,7 @@ `\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 \bool_new:N \g__nwejm_coverpage_bool \bool_new:N \g__nwejm_inside_pages_bool @@ -110,12 +111,15 @@ 12pt .code:n = {% \PassOptionsToClass{12pt}{book} },% + draft .code:n = {% + \PassOptionsToClass{draft}{book} + },% }% \ProcessKeysOptions { nwejm } \LoadClass { book } \PassOptionsToPackage{export}{adjustbox}% -\PassOptionsToPackage{fleqn}{mathtools}% -\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev}{cleveref} +\PassOptionsToPackage{fleqn}{amsmath}% +\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev,capitalize}{cleveref} \AtBeginDocument{ \LoadDictionaryFor{french}{nwejm} \LoadDictionaryFor{english}{nwejm} @@ -135,17 +139,21 @@ \RequirePackage[T1]{fontenc} \RequirePackage[pagestyles]{titlesec}% \RequirePackage{graphicx}% +\RequirePackage{adjustbox}% +\RequirePackage{xr} +\RequirePackage{currfile} +\RequirePackage[multiple]{footmisc}% +\RequirePackage{marginnote}% +\RequirePackage{refcount}% +\RequirePackage{xcolor}% +\RequirePackage{afterpage}% +\RequirePackage{ifoddpage}% \RequirePackage{import}% \bool_if:nT { \g__nwejm_for_authors_bool } { \RequirePackage{draftwatermark}[2006/06/30]% } -\RequirePackage{adjustbox}% \RequirePackage{zref-totpages} -\RequirePackage{xr} -\RequirePackage{currfile} \RequirePackage{zref-xr}% -\RequirePackage[multiple]{footmisc}% -\RequirePackage{xcolor}% \bool_if:NTF {\g__nwejm_cover_bool} { \RequirePackage{tcolorbox} \RequirePackage{tikzpagenodes} @@ -174,13 +182,16 @@ }{ \RequirePackage[group=false,subpreambles,sort]{standalone}% } +\RequirePackage[foreground]{pagegrid}% +\RequirePackage{datatool}% +\RequirePackage{placeins}% \RequirePackage{xspace}% \RequirePackage[autostyle]{csquotes}% \RequirePackage{array} \RequirePackage{booktabs} \RequirePackage{mathtools} -\RequirePackage[thmmarks,amsmath]{ntheorem} -\RequirePackage{mathrsfs} +\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem} +\RequirePackage{rsfso} \RequirePackage{esvect} \RequirePackage[easyscsl,noDcommand]{kpfonts} \RequirePackage{geometry} @@ -188,27 +199,26 @@ \RequirePackage{fmtcount}% \RequirePackage{babel}% \RequirePackage{varioref} +\RequirePackage{subcaption} \RequirePackage{tocvsec2} \RequirePackage{etoc}% -\RequirePackage[babel=true]{microtype}% +\RequirePackage[babel=true,final]{microtype}% \RequirePackage[useregional]{datetime2}% \RequirePackage[inline]{enumitem}% \RequirePackage{environ} -\RequirePackage[foreground]{pagegrid}% -\RequirePackage{datatool}% -\RequirePackage{placeins}% \RequirePackage{footnote}% \RequirePackage[backend=biber,style=nwejm]{biblatex}% \ExecuteBibliographyOptions{defernumbers=true,dashed=false,uniquename=init,backref,safeinputenc} -\RequirePackage[hyperfootnotes=false,pdfencoding=unicode]{hyperref}% +\RequirePackage[hyperfootnotes=false,pdfencoding=unicode,final]{hyperref}% \AtBeginDocument{% - \hypersetup{hidelinks,hypertexnames=false}% + \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% \RequirePackage[all]{hypcap} \RequirePackage[numbered]{bookmark}% \RequirePackage[nowarn]{glossaries}% \RequirePackage{cleveref}% -\RequirePackage{autonum} +\expandafter\def\csname ver@etex.sty\endcsname{3000/12/31} +\let\globcount\newcount \makeglossaries \setglossarystyle{indexhypergroup} \setacronymstyle{long-sc-short} @@ -266,7 +276,7 @@ \ifcurrentbaselanguage{french}{\FBcolonspace}{}: % \ifundef{\Fcolonspace}{\FBcolonspace}{\Fcolonspace}: } -\tl_const:Nn \c__nwejm_aside_string_tl {--} +\tl_const:Nn \c__nwejm_aside_string_tl {---} \tl_const:Nn \c__nwejm_draftwatermark_string_tl {draft} \tl_const:Nn \c__nwejm_issue_bib_file_suffix_string_tl {__nwejm} \tl_const:Nn \c__nwejm_issue_bib_file_string_tl {\c_sys_jobname_str\c__nwejm_issue_bib_file_suffix_string_tl.bib} @@ -375,9 +385,9 @@ \dim_const:Nn \c__nwejm_paperwidth_dim { \c__nwejm_layoutwidth_dim + - 2 - \c__nwejm_potential_layoutoffset_dim - +\c__nwejm_potential_bindingoffset_dim + 2\c__nwejm_potential_layoutoffset_dim + + + \c__nwejm_potential_bindingoffset_dim } } \dim_const:Nn \c__nwejm_topmargin_dim { 20mm} @@ -521,10 +531,6 @@ % ,inner=\c__nwejm_innermargin_dim % ,outer=\c__nwejm_outermargin_dim }% -\bool_if:NF {\g__nwejm_coverpage_bool} { - \bool_if:NF {\g__nwejm_inside_pages_bool} { - }% -}% \bool_new:N \g__nwejm_tableofcontents_already_used_bool \renewcommand\etocbeforetitlehook {% @@ -550,6 +556,10 @@ } \bool_gset_true:N \g__nwejm_tableofcontents_already_used_bool }% +\renewcommand\etocaftercontentshook +{% + \exp_after:wN\newgeometry\exp_after:wN{\c__nwejm_main_geometry_tl}% +}% \newpagestyle{__nwejm_frontcover_ps}[]{% \sethead {}% @@ -605,10 +615,10 @@ \newpagestyle{__nwejm_mainmatter_ps}[]{% \sethead% [ - \tl_if_exist:NT {\g__nwejm_short_title_tl} + \tl_if_exist:NT {\g__nwejm_header_title_tl} { - \tl_if_empty:NF \g__nwejm_short_title_tl {% - \slshape\g__nwejm_short_title_tl + \tl_if_empty:NF \g__nwejm_header_title_tl {% + \slshape\g__nwejm_header_title_tl } } ]% @@ -1074,7 +1084,8 @@ % } \setlist[description,1]{font=\scshape\bfseries} \footnotesize% - \begin{multicols*}{2} + \begin{multicols*}{2} + \raggedright \setlength{\columnsep}{1mm} \begin{description}[leftmargin=2em] \item[\c__nwejm_editorinchief_string_tl] \ @@ -1263,7 +1274,7 @@ \tl_gclear:N \g__nwejm_keywords_tl \tl_clear:N \l_tmpb_clist \clist_set:Nn \l_tmpb_clist {#2} - \tl_set:Nn \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } + \tl_set:Nx \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } } \tl_new:N \g__nwejm_msc_tl \NewDocumentCommand \msc { m } { @@ -1398,31 +1409,30 @@ \tl_gset:Nn \g__nwejm_authors_instructions_tl {#1} } } -\addto\extrasfrench{% +\vref@addto\extrasfrench{% \def\reftextfaceafter {page~\reftextvario{ci-contre}{suivante}}% \def\reftextfacebefore{page~\reftextvario{ci-contre}% - {pr\’ec\’edente}}% + {pr\'ec\'edente}}% \def\reftextafter {page~suivante}% \def\reftextbefore - {page~pr\’ec\’edente}% - \def\reftextcurrent - {de~la~pr\’esente~page}% - \def\reftextfaraway#1{page~\pageref{#1}}% - \def\reftextpagerange#1#2{pages~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1}~\‘a~\ref{#2}}% -} -\addto\extrasngerman{% + {page~pr\'ec\'edente}% + \def\reftextcurrent {de~la~pr\'esente~page}% + \def\reftextfaraway#1{p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{p.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~\‘a\nobreakspace\ref{#2}}% +} +\vref@addto\extrasngerman{% \def\reftextfaceafter {auf~der~n\"achsten~Seite}% \def\reftextfacebefore{auf~der~vorherigen~Seite}% \let\reftextafter \reftextfaceafter \let\reftextbefore \reftextfacebefore \def\reftextcurrent {auf~dieser~Seite}% - \def\reftextfaraway#1{auf~Seite~\pageref{#1}}% - \def\reftextpagerange#1#2{auf~den~Seiten~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1}~bis~\ref{#2}}% + \def\reftextfaraway#1{auf~S.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{auf~den~S.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~bis\nobreakspace\ref{#2}}% } -\addto\extrasdutch{% +\vref@addto\extrasdutch{% \def\refpagename{pagina}% \def\reftextfaceafter {op~de~\reftextvario{rechter~\refpagename}% {\refpagename\ hiernaast}}% @@ -1433,18 +1443,19 @@ \def\reftextbefore {op~de~\reftextvario{vorige~\refpagename}% {\refpagename\ hiervoor}}% \def\reftextcurrent {op~deze~\refpagename}% - \def\reftextfaraway#1{op~\refpagename\c_space_tl\pageref{#1}} + \def\reftextfaraway#1{op~\refpagename\nobreakspace\pageref{#1}} } -\addto\extrasenglish{% +\vref@addto\extrasenglish{% \def\reftextfaceafter {on~the~\reftextvario{facing}{next}~page}% \def\reftextfacebefore{on~the~\reftextvario{facing}{preceding}~page}% \def\reftextafter {on~the~\reftextvario{following}{next}~page}% \def\reftextbefore {on~the~\reftextvario{preceding}{previous}~page}% \def\reftextcurrent {on~\reftextvario{this}{the~current}~page}% - \def\reftextfaraway#1{on~page~\pageref{#1}}% - \def\reftextpagerange#1#2{on~pages~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1}~to~\ref{#2}}% + \def\reftextfaraway#1{on~p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{on~pp.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~to\nobreakspace\ref{#2}}% } +\def\reftextvario#1#2{#2} \cs_new_protected:Nn \__nwejm_command_only_in_body:n { \cs_if_eq:NNF {\@onlypreamble} {\@notprerr} { @@ -1460,21 +1471,74 @@ \NewDocumentCommand \dates { m } { \keys_set:nn { nwejm/dates } { #1 } } +\tl_gset:Nn \g__nwejm_french_crefname_tl { + \clist_set:Nn \l_tmpa_clist {% + theorem, + corollary, + conjecture, + proposition, + lemma, + axiom, + definition, + remark, + example, + notation, + proof% + } + \clist_map_inline:Nn \l_tmpa_clist { + \crefname{#1}{ + \tl_lower_case:n{ + \GetTranslationFor{french}{#1} + } + }{% + \tl_lower_case:n{ + \GetTranslationFor{french}{plural-#1} + } + } + } + \crefname{equation}{{\'e}quation}{{\'e}quations}% + \crefname{figure}{figure}{figures}% + \crefname{table}{table}{tables}% + \crefname{page}{page}{pages}% + \crefname{part}{partie}{parties}% + \crefname{chapter}{chapitre}{chapitres}% + \crefname{section}{section}{sections}% + \crefname{appendix}{annexe}{annexes}% + \crefname{enumi}{point}{points}% + \crefname{footnote}{note}{notes}% + \crefname{theorem}{th\'eor\`eme}{th\'eor\`emes}% + \crefname{lemma}{lemme}{lemmes}% + \crefname{corollary}{corollaire}{corollaires}% + \crefname{proposition}{proposition}{propositions}% + \crefname{definition}{d\'efinition}{d\'efinitions}% + \crefname{result}{r\'esultat}{r\'esultats}% + \crefname{example}{exemple}{exemples}% + \crefname{remark}{remarque}{remarques}% + \crefname{note}{commentaire}{commentaires}% + \crefname{algorithm}{algorithme}{algorithmes}% + \crefname{listing}{liste}{listes}% + \crefname{line}{ligne}{lignes}% +} \NewDocumentCommand \inputarticle { O{english} m } {% \newrefsection \tl_if_eq:nnTF { #1 } { german } {% \selectlanguage{ngerman} }{ - \selectlanguage{#1} + \tl_if_eq:nnTF { #1 } { french } {% + \selectlanguage{french} + \g__nwejm_french_crefname_tl + }{ + \selectlanguage{#1} + } }% \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 + \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 \inputfrom{./}{#2} \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist { footnote, @@ -1515,20 +1579,28 @@ }% } \tl_new:N \g__nwejm_title_tl -\RenewDocumentCommand \title { o m } { +\RenewDocumentCommand \title { o o m } { \cleardoublepage \int_gincr:N \g__nwejm_articles_int \tl_gclear:N \g__nwejm_short_title_tl + \tl_gclear:N \g__nwejm_header_title_tl \tl_gclear:N \g__nwejm_short_subtitle_tl % \IfNoValueF {#1} { \tl_gset:Nn \g__nwejm_short_title_tl {#1} } - \tl_gset:Nn \g__nwejm_title_tl {#2} + \IfNoValueF {#2} + { + \tl_gset:Nn \g__nwejm_header_title_tl {#2} + } + \tl_gset:Nn \g__nwejm_title_tl {#3} \tl_if_empty:NT \g__nwejm_short_title_tl {% \tl_gset_eq:NN \g__nwejm_short_title_tl \g__nwejm_title_tl } + \tl_if_empty:NT \g__nwejm_header_title_tl {% + \tl_gset_eq:NN \g__nwejm_header_title_tl \g__nwejm_short_title_tl + } } \tl_new:N \g__nwejm_subtitle_tl \NewDocumentCommand \subtitle { o m } { @@ -1680,7 +1752,7 @@ \tl_new:N \l__nwejm_title_box_tl \tl_new:N \g__nwejm_title_for_toc_tl \RenewDocumentCommand \maketitle { } { - \FloatBarrier% + \FloatBarrier% \tl_gset:Nn \g__nwejm_article_bib_key_tl {% \c__nwejm_issue_bib_key_tl -art- @@ -1872,7 +1944,8 @@ \cs_set_eq:NN \__nwejm_subsection \subsection \cs_set_eq:NN \__nwejm_subsubsection \subsubsection \AfterPreamble{% - \RenewDocumentCommand \section { s o m } {% + \RenewDocumentCommand \section { s o o m } {% + \tl_gclear:N \g__nwejm_short_section_title_tl \IfBooleanTF {#1} { \setsecnumdepth{none}% @@ -1880,7 +1953,16 @@ { \resetsecnumdepth*% } - \IfNoValueTF{#2}{\__nwejm_section{#3}}{\__nwejm_section[#2]{#3}} + \tl_gset:Nn \g__nwejm_section_title_tl {#4} + \IfNoValueTF{#2}{ + \tl_gset:Nn \g__nwejm_short_section_title_tl {#4} + }{ + \tl_gset:Nn \g__nwejm_short_section_title_tl {#2} + } + \__nwejm_section[\g__nwejm_short_section_title_tl]{\g__nwejm_section_title_tl} + \IfNoValueF {#3}{ + \sectionmark{#3} + } } \RenewDocumentCommand \subsection { s o m } {% \IfBooleanT {#1} @@ -1954,6 +2036,10 @@ }{ } } +\DeclareCaptionLabelSeparator{dash}{\nobreakspace--\nobreakspace} +\captionsetup{ + labelsep=dash + } \NewDocumentCommand \century { s m } {% \__nwejm_ordinalnum_suffix:n {#2}% \IfBooleanTF {#1} @@ -2203,12 +2289,16 @@ } \clist_map_inline:Nn \l_tmpa_clist { \crefname{#1}{ - \GetTranslation{#1} - }{% - \GetTranslation{plural-#1} + \tl_mixed_case:n{ + \GetTranslation{#1} + } + }{ + \tl_mixed_case:n{ + \GetTranslation{plural-#1} + } } \Crefname{#1}{ - \tl_mixed_case:n{ \protect + \tl_mixed_case:n{ \GetTranslation{#1} } }{% @@ -2217,6 +2307,9 @@ } } } +\AfterEndPreamble{ + \ifcurrentbaselanguage{french}{\g__nwejm_french_crefname_tl}{} +} \clist_set:Nn \l_tmpa_clist {% hypothesis, assertion% @@ -2497,19 +2590,11 @@ #1 } \NewDocumentCommand \set { m O{} } { - \if@display \tl_if_empty:nTF {#2} {% \__nwejm_set*{#1} }{ \__nwejm_set*{#1\l__nwejm_given_tl #2} } - \else - \tl_if_empty:nTF {#2} {% - \__nwejm_set{#1} - }{ - \__nwejm_set{#1\l__nwejm_given_tl #2} - } - \fi } \DeclareDocumentCommand{\NewPairedDelimiter}{mm} { @@ -2632,14 +2717,280 @@ left=<, right=> } -\AfterEndPreamble{ - \autonum@generatePatchedReferenceCSL{vref} - \clist_set:Nn \l_tmpa_clist {equation,align,gather,multline,flalign} - \clist_map_inline:Nn \l_tmpa_clist { - \cs_set_eq:cc {#1*} {#1} - \cs_set_eq:cc {end#1*} {end#1} +\AtEndPreamble{\allowdisplaybreaks} +\int_new:N \g_multiline_eq_int +\int_new:N \g_line_of_multiline_eq_int +\tl_new:N \g_line_of_multiline_eq_label_tl +\tl_new:N \g_next_line_of_multiline_eq_label_tl +\clist_set:Nn \l_tmpa_clist {align,multline} +\clist_map_inline:Nn \l_tmpa_clist { + \cs_set_eq:cc {db_#1_start:} {#1} + \cs_set_eq:cc {db_#1_end:} {end#1} + \cs_set_eq:cc {db_#1_star_start:} {#1*} + \NewDocumentEnvironment{amsmath#1}{} + {\cs:w db_#1_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} + \NewDocumentEnvironment{amsmath#1*}{} + {\cs:w db_#1_star_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {#1} \BODY + } + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {#1*} \BODY + } +} +\bool_new:N \g__nwejm_within_patched_amsmath_env_bool +\clist_set:Nn \l_tmpa_clist {flalign,alignat} +\clist_map_inline:Nn \l_tmpa_clist { + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {align} \BODY + } + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {align*} \BODY + } +} +\seq_new:N \l_db_multiline_eq_seq +\cs_new_protected:Nn \db_multiline_eq:nn +{ + \int_gincr:N \g_multiline_eq_int + \int_zero:N \g_line_of_multiline_eq_int + \int_gincr:N \g_line_of_multiline_eq_int + \tl_gset:Nx \g_tmpa_tl { + multilineeq + - + \int_use:N \g_multiline_eq_int + - + line + - + } + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} + } + \ltx@label{\g_line_of_multiline_eq_label_tl} + % + \seq_set_split:Nnn \l_db_multiline_eq_seq { \\ } { #2 } + \tl_if_in:nnTF {#1} {multline} { + \begin{amsmath#1} + \bool_gset_true:N \g__nwejm_within_patched_amsmath_env_bool + \seq_use:Nnnn \l_db_multiline_eq_seq + { \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@double@space } + \hfill + \end{amsmath#1} + \bool_gset_false:N \g__nwejm_within_patched_amsmath_env_bool + }{ + \begin{amsmath#1} + \bool_gset_true:N \g__nwejm_within_patched_amsmath_env_bool + \seq_use:Nn \l_db_multiline_eq_seq { \multiline@double@backslash } + \end{amsmath#1} + \bool_gset_false:N \g__nwejm_within_patched_amsmath_env_bool } - % \msg_warning:nnn{nwejmart}{Starred~AMS~environments}{#1} + } +\cs_generate_variant:Nn \db_multiline_eq:nn { nV } +\cs_new_protected:Nn \db_multiline_double_backslash:nn +{ + \db_add_marginal_note: + \IfValueTF{#2}{% + \IfBooleanTF{#1}{\\*[#2]}{\\[#2]}% + }{% + \IfBooleanTF{#1}{\\*}{\\}% + }% + % + \db_add_multiline_eq_label: +} +\NewDocumentCommand{\multiline@double@backslash}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} +} +\NewDocumentCommand{\multiline@double@backslash@add@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{\mathindent} +} +\NewDocumentCommand{\multiline@double@backslash@add@double@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{2\mathindent} +} +\cs_new_protected:Nn \db_add_marginal_note: +{ + \int_compare:nNnT { + \getpagerefnumber{\g_next_line_of_multiline_eq_label_tl}% + }>{ + \getpagerefnumber{\g_line_of_multiline_eq_label_tl}% + }{ + \reversemarginpar + \marginnote[\g__nwejm_equation_continues_next_page_tl]{} + \normalmarginpar + \marginnote[\g__nwejm_equation_continues_next_page_tl]{} + } +} +\tl_gset:Nn \g__nwejm_equation_continues_next_page_tl { + \tiny + \sffamily + \slshape + ( + \GetTranslation{equation-continues-next-page} + ) +} +\cs_new_protected:Nn \db_add_multiline_eq_label: +{ + \ifmeasuring@\else + \int_gincr:N \g_line_of_multiline_eq_int + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} + } + \ltx@label{\g_line_of_multiline_eq_label_tl}% + \fi +} +\def\MT_intertext: {% + \def\intertext##1{% + \db_add_marginal_note: + \ifvmode\else\\\@empty\fi + \noalign{% + \penalty\postdisplaypenalty\vskip\belowdisplayskip + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + \vbox{\normalbaselines + \ifdim + \ifdim\@totalleftmargin=\z@ + \linewidth + \else + -\maxdimen + \fi + =\columnwidth + \else \parshape\@ne \@totalleftmargin \linewidth + \fi + \noindent\ignorespaces##1\par}% + \penalty\predisplaypenalty\vskip\abovedisplayskip% + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + }% + \db_add_multiline_eq_label: + }% + \MH_let:NwN \shortintertext \shortintertext@ +} +\pretocmd{\MT_orig_shortintertext:n}{% + \bool_if:NT \g__nwejm_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_orig_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +\pretocmd{\MT_shortintertext:n}{% + \bool_if:NT \g__nwejm_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +\setkeys{\MT_options_name:}{ + original-intertext=false, + original-shortintertext=false +} +\newcommand*{\nwejm@marginnote}{% + \@dblarg\NWEJM@mn@marginnote +} +\newcommand{\NWEJM@mn@marginnote}[2][]{% + \ifhmode + \@bsphack + \begingroup + \ifdim\@savsk>\z@\else + \def\:{\@xifnch}\expandafter\def\: { \futurelet\@let@token\@ifnch}% + \fi + \else + \begingroup + \fi + \@ifnextchar [{\NWEJM@mn__nwejmmarginnote[{#1}]{#2}}{\NWEJM@mn__nwejmmarginnote[{#1}]{#2}[\z@]}% +} +\newcommand{\NWEJM@mn__nwejmmarginnote}{} +\long\def\NWEJM@mn__nwejmmarginnote[#1]#2[#3]{% + \endgroup + \ifhmode + \NWEJM@mn__nwejm@marginnote[{#1}]{#2}[{#3}]% + \@esphack + \else + \NWEJM@mn__nwejm@marginnote[{#1}]{#2}[{#3}]% + \fi +} + +\long\def\NWEJM@mn__nwejm@marginnote[#1]#2[#3]{% + \begingroup + \ifmmode\mn@strut\let\@tempa\mn@vadjust\else + \if@inlabel\leavevmode\fi + \ifhmode\mn@strut\let\@tempa\mn@vadjust\else\let\@tempa\mn@vlap\fi + \fi + \@tempa{% + \vbox to\z@{% + \vss + \@mn@margintest + \if@reversemargin\if@tempswa + \@tempswafalse + \else + \@tempswatrue + \fi\fi + \rlap{% + \ifx\@mn@currxpos\relax + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else\ifx\@mn@currxpos\@empty + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos seems to be \@mn@currxpos,\MessageBreak + \string\marginnoterightadjust + \space ignored}% + \fi + \begingroup + \setlength{\@tempdima}{\@mn@currxpos}% + \kern-\@tempdima + \if@twoside\ifodd\@mn@currpage\relax + \kern\oddsidemargin + \else + \kern\evensidemargin + \fi + \else + \kern\oddsidemargin + \fi + \kern 1in + \endgroup + \fi + \fi + \kern\marginnotetextwidth\kern\marginparsep + \vbox to\z@{\kern\marginnotevadjust\kern #3 + \vbox to\z@{% + \hsize\marginparwidth + \linewidth\hsize + \kern-\parskip + \marginfont\raggedrightmarginnote\strut\hspace{\z@}% + \ignorespaces#2\endgraf + \vss}% + \vss}% + }% + }% + }% + \endgroup } \etocsettocdepth{section} \@ifpackageloaded{pgfplots}{% @@ -2659,7 +3010,6 @@ }% \SetCiteCommand{\autocite}% }% -\int_new:N \l__nwejm_section_int \cs_set_eq:NN \__nwejm_printbibliography \printbibliography \RenewDocumentCommand \printbibliography { O{} } { \FloatBarrier% @@ -2757,12 +3107,8 @@ } } \ExplSyntaxOff -\patchcmd{\autonum@saveEnvironmentSubcommands} - {(0,0)\begin} - {(0,0)\hfuzz=\maxdimen\begin} - {}{} %% -%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze +%% Copyright (C) 2015-2018 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 new file mode 100644 index 00000000000..08a5934249f --- /dev/null +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx @@ -0,0 +1,34 @@ +%% +%% This is file `nwejm.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% nwejm.dtx (with options: `datamodel') +%% -------:| ----------------------------------------------------------------- +%% nwejm:| Class for the journal "North-Western European Journal of Mathematics" +%% Author:| Denis Bitouze +%% E-mail:| denis.bitouze@univ-littoral.fr +%% License:| Released under the LaTeX Project Public License v1.3c or later +%% See:| http://www.latex-project.org/lppl.txt +%% +%% +%% Copyright (C) 2015-2018 by Denis Bitouze +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License (LPPL), either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Denis Bitouze. +%% +%% This work consists of the file nwejm.dtx and a Makefile. +%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls. +%% Running "make inst" installs the files in the user's TeX tree. +%% Running "make install" installs the files in the local TeX tree. +%% +%% +%% End of file `nwejm.dbx'. diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx index 1be918cfd91..22649bb4c72 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, 2016, 2017 by Denis Bitouze +%% Copyright (C) 2015-2018 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 bce4a1fbd6e..be444ea3ccf 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} - {2017/02/14} - {0.98d} + {2018/04/07} + {0.98e} { Class for the journal "North-Western European Journal of Mathematics". } @@ -30,7 +30,7 @@ \msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{You~ are~ using~ the~ `nwejm'~ class~ designed~ for~ the~ complete~ issues~ of~ the~ NWEJM~ and~ aimed~ for~ the~ NWEJM's~ team,~ not~ for~ authors~ of~ articles:~ if~ you're~ - an~ author~ of~ an~ article~,~ you~ should~ use~ the~ `nwejmart'~ class~ + an~ author~ of~ an~ article,~ you~ should~ use~ the~ `nwejmart'~ class~ instead.~ Otherwise,~ if~ you're~ from~ the~ NWEJM's~ team,~ please~ note~ that~ the~ issue's~ main~ file~ should~ be~ named~ `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~ `\c_sys_jobname_str.tex'.~ @@ -91,6 +91,7 @@ \selectlanguage{#1} } } +\bool_new:N \g__nwejm_nolocaltoc_bool \keys_define:nn { nwejm } { 10pt .code:n = {% @@ -102,6 +103,9 @@ 12pt .code:n = {% \PassOptionsToClass{12pt}{book} },% + draft .code:n = {% + \PassOptionsToClass{draft}{book} + },% english .code:n = { \__nwejm_language:n {english} },% @@ -128,8 +132,8 @@ \ProcessKeysOptions { nwejm } \LoadClass { book } \PassOptionsToPackage{export}{adjustbox}% -\PassOptionsToPackage{fleqn}{mathtools}% -\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev}{cleveref} +\PassOptionsToPackage{fleqn}{amsmath}% +\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev,capitalize}{cleveref} \bool_if:NF {\g__nwejm_language_specified_bool} { \__nwejm_language:n {english} } @@ -148,39 +152,46 @@ \RequirePackage{xr} \RequirePackage{currfile} \RequirePackage[multiple]{footmisc}% +\RequirePackage{marginnote}% +\RequirePackage{refcount}% \RequirePackage{xcolor}% +\RequirePackage{afterpage}% +\RequirePackage{ifoddpage}% +\RequirePackage{placeins}% \RequirePackage{xspace}% \RequirePackage[autostyle]{csquotes}% \RequirePackage{array} \RequirePackage{booktabs} \RequirePackage{mathtools} -\RequirePackage[thmmarks,amsmath]{ntheorem} -\RequirePackage{mathrsfs} +\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem} +\RequirePackage{rsfso} \RequirePackage{esvect} -\RequirePackage[noDcommand]{kpfonts} +\RequirePackage[easyscsl,noDcommand]{kpfonts} \RequirePackage{geometry} \RequirePackage{translations}% \RequirePackage{fmtcount}% \RequirePackage{babel}% \RequirePackage{varioref} +\RequirePackage{subcaption} \RequirePackage{tocvsec2} \RequirePackage{etoc}% -\RequirePackage[babel=true]{microtype}% +\RequirePackage[babel=true,final]{microtype}% \RequirePackage[useregional]{datetime2}% \RequirePackage[inline]{enumitem}% \RequirePackage{environ} \RequirePackage{footnote}% \RequirePackage[backend=biber,style=nwejm]{biblatex}% \ExecuteBibliographyOptions{defernumbers=true,dashed=false,uniquename=init,backref,safeinputenc} -\RequirePackage[hyperfootnotes=false,pdfencoding=unicode]{hyperref}% +\RequirePackage[hyperfootnotes=false,pdfencoding=unicode,final]{hyperref}% \AtBeginDocument{% - \hypersetup{hidelinks,hypertexnames=false}% + \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% \RequirePackage[all]{hypcap} \RequirePackage[numbered]{bookmark}% \RequirePackage[nowarn]{glossaries}% \RequirePackage{cleveref}% -\RequirePackage{autonum} +\expandafter\def\csname ver@etex.sty\endcsname{3000/12/31} +\let\globcount\newcount \makeglossaries \setglossarystyle{indexhypergroup} \setacronymstyle{long-sc-short} @@ -210,7 +221,7 @@ \ifcurrentbaselanguage{french}{\FBcolonspace}{}: % \ifundef{\Fcolonspace}{\FBcolonspace}{\Fcolonspace}: } -\tl_const:Nn \c__nwejm_aside_string_tl {--} +\tl_const:Nn \c__nwejm_aside_string_tl {---} \tl_const:Nn \c__nwejm_draftwatermark_string_tl {draft} \tl_const:Nn \c__nwejm_issue_bib_file_suffix_string_tl {__nwejm} \tl_const:Nn \c__nwejm_issue_bib_file_string_tl {\c_sys_jobname_str\c__nwejm_issue_bib_file_suffix_string_tl.bib} @@ -237,42 +248,12 @@ \dim_const:Nn \c__nwejm_layoutheight_dim { 240mm} \dim_const:Nn \c__nwejm_layoutwidth_dim { 170mm} \dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 10mm } -\bool_if:NTF {\g__nwejm_for_printer_bool} { - \dim_const:Nn \c__nwejm_potential_layoutoffset_dim { \c__nwejm_printer_layoutoffset_dim} -}{ - \dim_const:Nn \c__nwejm_potential_layoutoffset_dim {\c_zero_dim} -} -\bool_if:NTF {\g__nwejm_cover_bool} { - \dim_compare:nTF {\g__nwejm_binding_dim > \c_zero_dim} {% - \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \g__nwejm_binding_dim } - }{ - \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim } - } -}{ - \dim_const:Nn \c__nwejm_potential_bindingoffset_dim {\c_zero_dim} -} \dim_const:Nn \c__nwejm_paperheight_dim { \c__nwejm_layoutheight_dim - + - 2\c__nwejm_potential_layoutoffset_dim } -\bool_if:NTF {\g__nwejm_cover_bool} { \dim_const:Nn \c__nwejm_paperwidth_dim { \c__nwejm_layoutwidth_dim - + - \c__nwejm_potential_layoutoffset_dim - + - .5\c__nwejm_potential_bindingoffset_dim } -}{ - \dim_const:Nn \c__nwejm_paperwidth_dim { - \c__nwejm_layoutwidth_dim - + - 2 - \c__nwejm_potential_layoutoffset_dim - +\c__nwejm_potential_bindingoffset_dim - } -} \dim_const:Nn \c__nwejm_topmargin_dim { 20mm} \dim_const:Nn \c__nwejm_topmargin_frontcover_dim { \c__nwejm_topmargin_dim @@ -318,12 +299,8 @@ \geometry{% papersize={\c__nwejm_paperwidth_dim,\c__nwejm_paperheight_dim} } -\bool_if:NT {\g__nwejm_inside_pages_bool} { - \geometry{showcrop} -} \tl_const:Nn \c__nwejm_main_geometry_tl {% ,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim} - ,layoutoffset=\c__nwejm_potential_layoutoffset_dim ,textwidth=\c__nwejm_layoutwidth_dim*3/4 ,textheight=\c__nwejm_layoutheight_dim*3/4 % ,marginratio={4\string :6,5\string :7} @@ -353,10 +330,10 @@ \newpagestyle{__nwejm_mainmatter_ps}[]{% \sethead% [ - \tl_if_exist:NT {\g__nwejm_short_title_tl} + \tl_if_exist:NT {\g__nwejm_header_title_tl} { - \tl_if_empty:NF \g__nwejm_short_title_tl {% - \slshape\g__nwejm_short_title_tl + \tl_if_empty:NF \g__nwejm_header_title_tl {% + \slshape\g__nwejm_header_title_tl } } ]% @@ -615,7 +592,7 @@ \tl_gclear:N \g__nwejm_keywords_tl \tl_clear:N \l_tmpb_clist \clist_set:Nn \l_tmpb_clist {#2} - \tl_set:Nn \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } + \tl_set:Nx \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } \tl_if_empty:nTF {#1} {% \hypersetup{pdfkeywords={\g__nwejm_keywords_tl}} }{ @@ -636,6 +613,53 @@ {\externaldocument[__nwejm-]{\c__nwejm_main_file_name_tl} \AtBeginDocument{\setcounter{page}{\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}} } +\vref@addto\extrasfrench{% + \def\reftextfaceafter {page~\reftextvario{ci-contre}{suivante}}% + \def\reftextfacebefore{page~\reftextvario{ci-contre}% + {pr\'ec\'edente}}% + \def\reftextafter + {page~suivante}% + \def\reftextbefore + {page~pr\'ec\'edente}% + \def\reftextcurrent {de~la~pr\'esente~page}% + \def\reftextfaraway#1{p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{p.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~\‘a\nobreakspace\ref{#2}}% +} +\vref@addto\extrasngerman{% + \def\reftextfaceafter {auf~der~n\"achsten~Seite}% + \def\reftextfacebefore{auf~der~vorherigen~Seite}% + \let\reftextafter \reftextfaceafter + \let\reftextbefore \reftextfacebefore + \def\reftextcurrent {auf~dieser~Seite}% + \def\reftextfaraway#1{auf~S.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{auf~den~S.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~bis\nobreakspace\ref{#2}}% +} +\vref@addto\extrasdutch{% + \def\refpagename{pagina}% + \def\reftextfaceafter {op~de~\reftextvario{rechter~\refpagename}% + {\refpagename\ hiernaast}}% + \def\reftextfacebefore{op~de~\reftextvario{linker~\refpagename}% + {\refpagename\ hiernaast}}% + \def\reftextafter {op~de~\reftextvario{volgende~\refpagename}% + {\refpagename\ hierna}}% + \def\reftextbefore {op~de~\reftextvario{vorige~\refpagename}% + {\refpagename\ hiervoor}}% + \def\reftextcurrent {op~deze~\refpagename}% + \def\reftextfaraway#1{op~\refpagename\nobreakspace\pageref{#1}} +} +\vref@addto\extrasenglish{% + \def\reftextfaceafter {on~the~\reftextvario{facing}{next}~page}% + \def\reftextfacebefore{on~the~\reftextvario{facing}{preceding}~page}% + \def\reftextafter {on~the~\reftextvario{following}{next}~page}% + \def\reftextbefore {on~the~\reftextvario{preceding}{previous}~page}% + \def\reftextcurrent {on~\reftextvario{this}{the~current}~page}% + \def\reftextfaraway#1{on~p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{on~pp.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~to\nobreakspace\ref{#2}}% +} +\def\reftextvario#1#2{#2} \cs_new_protected:Nn \__nwejm_command_only_in_body:n { \cs_if_eq:NNF {\@onlypreamble} {\@notprerr} { @@ -651,12 +675,65 @@ \NewDocumentCommand \dates { m } { \keys_set:nn { nwejm/dates } { #1 } } +\tl_gset:Nn \g__nwejm_french_crefname_tl { + \clist_set:Nn \l_tmpa_clist {% + theorem, + corollary, + conjecture, + proposition, + lemma, + axiom, + definition, + remark, + example, + notation, + proof% + } + \clist_map_inline:Nn \l_tmpa_clist { + \crefname{#1}{ + \tl_lower_case:n{ + \GetTranslationFor{french}{#1} + } + }{% + \tl_lower_case:n{ + \GetTranslationFor{french}{plural-#1} + } + } + } + \crefname{equation}{{\'e}quation}{{\'e}quations}% + \crefname{figure}{figure}{figures}% + \crefname{table}{table}{tables}% + \crefname{page}{page}{pages}% + \crefname{part}{partie}{parties}% + \crefname{chapter}{chapitre}{chapitres}% + \crefname{section}{section}{sections}% + \crefname{appendix}{annexe}{annexes}% + \crefname{enumi}{point}{points}% + \crefname{footnote}{note}{notes}% + \crefname{theorem}{th\'eor\`eme}{th\'eor\`emes}% + \crefname{lemma}{lemme}{lemmes}% + \crefname{corollary}{corollaire}{corollaires}% + \crefname{proposition}{proposition}{propositions}% + \crefname{definition}{d\'efinition}{d\'efinitions}% + \crefname{result}{r\'esultat}{r\'esultats}% + \crefname{example}{exemple}{exemples}% + \crefname{remark}{remarque}{remarques}% + \crefname{note}{commentaire}{commentaires}% + \crefname{algorithm}{algorithme}{algorithmes}% + \crefname{listing}{liste}{listes}% + \crefname{line}{ligne}{lignes}% +} \NewDocumentCommand \inputarticle { O{english} m } {% \newrefsection \tl_if_eq:nnTF { #1 } { german } {% \selectlanguage{ngerman} }{ - \selectlanguage{#1} + \tl_if_eq:nnTF { #1 } { french } {% + \selectlanguage{french} + \g__nwejm_french_crefname_tl + }{ + \selectlanguage{#1} + } }% \tl_if_eq:nnTF { #1 } { french } {% \FrenchFootnotes @@ -703,20 +780,28 @@ }% } \tl_new:N \g__nwejm_title_tl -\RenewDocumentCommand \title { o m } { +\RenewDocumentCommand \title { o o m } { \cleardoublepage \int_gincr:N \g__nwejm_articles_int \tl_gclear:N \g__nwejm_short_title_tl + \tl_gclear:N \g__nwejm_header_title_tl \tl_gclear:N \g__nwejm_short_subtitle_tl % \IfNoValueF {#1} { \tl_gset:Nn \g__nwejm_short_title_tl {#1} } - \tl_gset:Nn \g__nwejm_title_tl {#2} + \IfNoValueF {#2} + { + \tl_gset:Nn \g__nwejm_header_title_tl {#2} + } + \tl_gset:Nn \g__nwejm_title_tl {#3} \tl_if_empty:NT \g__nwejm_short_title_tl {% \tl_gset_eq:NN \g__nwejm_short_title_tl \g__nwejm_title_tl } + \tl_if_empty:NT \g__nwejm_header_title_tl {% + \tl_gset_eq:NN \g__nwejm_header_title_tl \g__nwejm_short_title_tl + } } \tl_new:N \g__nwejm_subtitle_tl \NewDocumentCommand \subtitle { o m } { @@ -1061,7 +1146,8 @@ \cs_set_eq:NN \__nwejm_subsection \subsection \cs_set_eq:NN \__nwejm_subsubsection \subsubsection \AfterPreamble{% - \RenewDocumentCommand \section { s o m } {% + \RenewDocumentCommand \section { s o o m } {% + \tl_gclear:N \g__nwejm_short_section_title_tl \IfBooleanTF {#1} { \setsecnumdepth{none}% @@ -1069,7 +1155,16 @@ { \resetsecnumdepth*% } - \IfNoValueTF{#2}{\__nwejm_section{#3}}{\__nwejm_section[#2]{#3}} + \tl_gset:Nn \g__nwejm_section_title_tl {#4} + \IfNoValueTF{#2}{ + \tl_gset:Nn \g__nwejm_short_section_title_tl {#4} + }{ + \tl_gset:Nn \g__nwejm_short_section_title_tl {#2} + } + \__nwejm_section[\g__nwejm_short_section_title_tl]{\g__nwejm_section_title_tl} + \IfNoValueF {#3}{ + \sectionmark{#3} + } } \RenewDocumentCommand \subsection { s o m } {% \IfBooleanT {#1} @@ -1143,6 +1238,10 @@ }{ } } +\DeclareCaptionLabelSeparator{dash}{\nobreakspace--\nobreakspace} +\captionsetup{ + labelsep=dash + } \NewDocumentCommand \century { s m } {% \__nwejm_ordinalnum_suffix:n {#2}% \IfBooleanTF {#1} @@ -1392,12 +1491,16 @@ } \clist_map_inline:Nn \l_tmpa_clist { \crefname{#1}{ - \GetTranslation{#1} - }{% - \GetTranslation{plural-#1} + \tl_mixed_case:n{ + \GetTranslation{#1} + } + }{ + \tl_mixed_case:n{ + \GetTranslation{plural-#1} + } } \Crefname{#1}{ - \tl_mixed_case:n{ \protect + \tl_mixed_case:n{ \GetTranslation{#1} } }{% @@ -1406,6 +1509,9 @@ } } } +\AfterEndPreamble{ + \ifcurrentbaselanguage{french}{\g__nwejm_french_crefname_tl}{} +} \clist_set:Nn \l_tmpa_clist {% hypothesis, assertion% @@ -1686,19 +1792,11 @@ #1 } \NewDocumentCommand \set { m O{} } { - \if@display \tl_if_empty:nTF {#2} {% \__nwejm_set*{#1} }{ \__nwejm_set*{#1\l__nwejm_given_tl #2} } - \else - \tl_if_empty:nTF {#2} {% - \__nwejm_set{#1} - }{ - \__nwejm_set{#1\l__nwejm_given_tl #2} - } - \fi } \DeclareDocumentCommand{\NewPairedDelimiter}{mm} { @@ -1821,14 +1919,280 @@ left=<, right=> } -\AfterEndPreamble{ - \autonum@generatePatchedReferenceCSL{vref} - \clist_set:Nn \l_tmpa_clist {equation,align,gather,multline,flalign} - \clist_map_inline:Nn \l_tmpa_clist { - \cs_set_eq:cc {#1*} {#1} - \cs_set_eq:cc {end#1*} {end#1} +\AtEndPreamble{\allowdisplaybreaks} +\int_new:N \g_multiline_eq_int +\int_new:N \g_line_of_multiline_eq_int +\tl_new:N \g_line_of_multiline_eq_label_tl +\tl_new:N \g_next_line_of_multiline_eq_label_tl +\clist_set:Nn \l_tmpa_clist {align,multline} +\clist_map_inline:Nn \l_tmpa_clist { + \cs_set_eq:cc {db_#1_start:} {#1} + \cs_set_eq:cc {db_#1_end:} {end#1} + \cs_set_eq:cc {db_#1_star_start:} {#1*} + \NewDocumentEnvironment{amsmath#1}{} + {\cs:w db_#1_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} + \NewDocumentEnvironment{amsmath#1*}{} + {\cs:w db_#1_star_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {#1} \BODY } - % \msg_warning:nnn{nwejmart}{Starred~AMS~environments}{#1} + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {#1*} \BODY + } +} +\bool_new:N \g__nwejm_within_patched_amsmath_env_bool +\clist_set:Nn \l_tmpa_clist {flalign,alignat} +\clist_map_inline:Nn \l_tmpa_clist { + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {align} \BODY + } + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {align*} \BODY + } +} +\seq_new:N \l_db_multiline_eq_seq +\cs_new_protected:Nn \db_multiline_eq:nn +{ + \int_gincr:N \g_multiline_eq_int + \int_zero:N \g_line_of_multiline_eq_int + \int_gincr:N \g_line_of_multiline_eq_int + \tl_gset:Nx \g_tmpa_tl { + multilineeq + - + \int_use:N \g_multiline_eq_int + - + line + - + } + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} + } + \ltx@label{\g_line_of_multiline_eq_label_tl} + % + \seq_set_split:Nnn \l_db_multiline_eq_seq { \\ } { #2 } + \tl_if_in:nnTF {#1} {multline} { + \begin{amsmath#1} + \bool_gset_true:N \g__nwejm_within_patched_amsmath_env_bool + \seq_use:Nnnn \l_db_multiline_eq_seq + { \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@double@space } + \hfill + \end{amsmath#1} + \bool_gset_false:N \g__nwejm_within_patched_amsmath_env_bool + }{ + \begin{amsmath#1} + \bool_gset_true:N \g__nwejm_within_patched_amsmath_env_bool + \seq_use:Nn \l_db_multiline_eq_seq { \multiline@double@backslash } + \end{amsmath#1} + \bool_gset_false:N \g__nwejm_within_patched_amsmath_env_bool + } + } +\cs_generate_variant:Nn \db_multiline_eq:nn { nV } +\cs_new_protected:Nn \db_multiline_double_backslash:nn +{ + \db_add_marginal_note: + \IfValueTF{#2}{% + \IfBooleanTF{#1}{\\*[#2]}{\\[#2]}% + }{% + \IfBooleanTF{#1}{\\*}{\\}% + }% + % + \db_add_multiline_eq_label: +} +\NewDocumentCommand{\multiline@double@backslash}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} +} +\NewDocumentCommand{\multiline@double@backslash@add@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{\mathindent} +} +\NewDocumentCommand{\multiline@double@backslash@add@double@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{2\mathindent} +} +\cs_new_protected:Nn \db_add_marginal_note: +{ + \int_compare:nNnT { + \getpagerefnumber{\g_next_line_of_multiline_eq_label_tl}% + }>{ + \getpagerefnumber{\g_line_of_multiline_eq_label_tl}% + }{ + \reversemarginpar + \marginnote[\g__nwejm_equation_continues_next_page_tl]{} + \normalmarginpar + \marginnote[\g__nwejm_equation_continues_next_page_tl]{} + } +} +\tl_gset:Nn \g__nwejm_equation_continues_next_page_tl { + \tiny + \sffamily + \slshape + ( + \GetTranslation{equation-continues-next-page} + ) +} +\cs_new_protected:Nn \db_add_multiline_eq_label: +{ + \ifmeasuring@\else + \int_gincr:N \g_line_of_multiline_eq_int + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} + } + \ltx@label{\g_line_of_multiline_eq_label_tl}% + \fi +} +\def\MT_intertext: {% + \def\intertext##1{% + \db_add_marginal_note: + \ifvmode\else\\\@empty\fi + \noalign{% + \penalty\postdisplaypenalty\vskip\belowdisplayskip + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + \vbox{\normalbaselines + \ifdim + \ifdim\@totalleftmargin=\z@ + \linewidth + \else + -\maxdimen + \fi + =\columnwidth + \else \parshape\@ne \@totalleftmargin \linewidth + \fi + \noindent\ignorespaces##1\par}% + \penalty\predisplaypenalty\vskip\abovedisplayskip% + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + }% + \db_add_multiline_eq_label: + }% + \MH_let:NwN \shortintertext \shortintertext@ +} +\pretocmd{\MT_orig_shortintertext:n}{% + \bool_if:NT \g__nwejm_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_orig_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +\pretocmd{\MT_shortintertext:n}{% + \bool_if:NT \g__nwejm_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +\setkeys{\MT_options_name:}{ + original-intertext=false, + original-shortintertext=false +} +\newcommand*{\nwejm@marginnote}{% + \@dblarg\NWEJM@mn@marginnote +} +\newcommand{\NWEJM@mn@marginnote}[2][]{% + \ifhmode + \@bsphack + \begingroup + \ifdim\@savsk>\z@\else + \def\:{\@xifnch}\expandafter\def\: { \futurelet\@let@token\@ifnch}% + \fi + \else + \begingroup + \fi + \@ifnextchar [{\NWEJM@mn__nwejmmarginnote[{#1}]{#2}}{\NWEJM@mn__nwejmmarginnote[{#1}]{#2}[\z@]}% +} +\newcommand{\NWEJM@mn__nwejmmarginnote}{} +\long\def\NWEJM@mn__nwejmmarginnote[#1]#2[#3]{% + \endgroup + \ifhmode + \NWEJM@mn__nwejm@marginnote[{#1}]{#2}[{#3}]% + \@esphack + \else + \NWEJM@mn__nwejm@marginnote[{#1}]{#2}[{#3}]% + \fi +} + +\long\def\NWEJM@mn__nwejm@marginnote[#1]#2[#3]{% + \begingroup + \ifmmode\mn@strut\let\@tempa\mn@vadjust\else + \if@inlabel\leavevmode\fi + \ifhmode\mn@strut\let\@tempa\mn@vadjust\else\let\@tempa\mn@vlap\fi + \fi + \@tempa{% + \vbox to\z@{% + \vss + \@mn@margintest + \if@reversemargin\if@tempswa + \@tempswafalse + \else + \@tempswatrue + \fi\fi + \rlap{% + \ifx\@mn@currxpos\relax + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else\ifx\@mn@currxpos\@empty + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos seems to be \@mn@currxpos,\MessageBreak + \string\marginnoterightadjust + \space ignored}% + \fi + \begingroup + \setlength{\@tempdima}{\@mn@currxpos}% + \kern-\@tempdima + \if@twoside\ifodd\@mn@currpage\relax + \kern\oddsidemargin + \else + \kern\evensidemargin + \fi + \else + \kern\oddsidemargin + \fi + \kern 1in + \endgroup + \fi + \fi + \kern\marginnotetextwidth\kern\marginparsep + \vbox to\z@{\kern\marginnotevadjust\kern #3 + \vbox to\z@{% + \hsize\marginparwidth + \linewidth\hsize + \kern-\parskip + \marginfont\raggedrightmarginnote\strut\hspace{\z@}% + \ignorespaces#2\endgraf + \vss}% + \vss}% + }% + }% + }% + \endgroup } \etocsettocdepth{subsection} \@ifpackageloaded{pgfplots}{% @@ -1848,9 +2212,9 @@ }% \SetCiteCommand{\autocite}% }% -\int_new:N \l__nwejm_section_int \cs_set_eq:NN \__nwejm_printbibliography \printbibliography \RenewDocumentCommand \printbibliography { O{} } { + \FloatBarrier% \tl_if_empty:NF {\g__nwejm_article_acknowledgments_tl} { \section*{\GetTranslation{Acknowledgments}} @@ -1932,12 +2296,8 @@ } } \ExplSyntaxOff -\patchcmd{\autonum@saveEnvironmentSubcommands} - {(0,0)\begin} - {(0,0)\hfuzz=\maxdimen\begin} - {}{} %% -%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze +%% Copyright (C) 2015-2018 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