texlive[47411] Master/texmf-dist: nwejm (9apr18)
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 9 23:18:46 CEST 2018
Revision: 47411
http://tug.org/svn/texlive?view=revision&revision=47411
Author: karl
Date: 2018-04-09 23:18:46 +0200 (Mon, 09 Apr 2018)
Log Message:
-----------
nwejm (9apr18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/nwejm/README.md
trunk/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl
trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf
trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf
trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf
trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.tex
trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf
trunk/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
trunk/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf
trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc
trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf
trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex
trunk/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx
trunk/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx
trunk/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty
trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf
trunk/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nwejm/README.md 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/doc/latex/nwejm/README.md 2018-04-09 21:18:46 UTC (rev 47411)
@@ -8,7 +8,7 @@
Release
-------
-Release 2017/02/14 v0.98d
+2018/04/07 v0.98e
Development
-----------
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.tex 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.tex 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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é
%
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty 2018-04-09 21:18:46 UTC (rev 47411)
@@ -0,0 +1,1678 @@
+\NeedsTeXFormat{LaTeX2e}
+%
+\ProvidesPackage{kpfonts}
+ [2010/08/20 v3.31]
+
+\newif\ifkp at math \kp at mathtrue
+\newif\ifkp at text \kp at texttrue
+\newif\ifkp at sf \kp at sftrue
+\newif\ifkp at tt \kp at tttrue
+\newif\ifkp at upgrk
+\newif\ifkp at slGrk
+\newif\ifkp at upRm
+\newif\ifkp at mathscr \kp at mathscrtrue
+\newif\ifkp at calasscr
+\newif\ifkp at oldReIm
+\newif\ifkp at osn
+\newif\ifkp at osnm
+\newif\ifkp at os
+\newif\ifkp at osm
+\newif\ifkp at vos
+\newif\ifkp at vosm
+\newif\ifkp at lighttext
+\newif\ifkp at lightmath
+\newif\ifkp at rmx
+\newif\ifkp at warning \kp at warningtrue
+\newif\ifkp at amsmath \kp at amsmathtrue
+\newif\ifkp at textcomp \kp at textcomptrue
+\newif\ifkp at narrowiints
+\newif\ifkp at partialup
+\newif\ifkp at largesmallcaps
+\newif\ifkp at Dcommand \kp at Dcommandtrue
+\newif\ifkp at nofligatures
+\newif\ifkp at Qtail
+\newif\ifkp at widermath
+\newif\ifkp at sfmath
+\newif\ifkp at sfmathbb
+\newif\ifkp at rmmathbb
+\newif\ifkp at easyscsl
+
+\DeclareOption{nomath} {\kp at mathfalse}
+\DeclareOption{notext} {\kp at textfalse}
+\DeclareOption{nosf} {\kp at sffalse}
+\DeclareOption{nott} {\kp at ttfalse}
+\DeclareOption{onlyrm} {\kp at ttfalse\kp at sffalse}
+\DeclareOption{uprightgreeks} {\kp at upgrktrue}
+\DeclareOption{slantedGreeks} {\kp at slGrktrue}
+\DeclareOption{uprightRoman} {\kp at upRmtrue}
+\DeclareOption{upright} {\kp at upRmtrue\kp at upgrktrue}
+\DeclareOption{frenchstyle} {\kp at upRmtrue\kp at upgrktrue}
+\DeclareOption{nomathscript} {\kp at mathscrfalse}
+\DeclareOption{mathcalasscript} {\kp at calasscrtrue}
+\DeclareOption{classicReIm} {\kp at oldReImtrue}
+\DeclareOption{oldstylenums} {\kp at osntrue}
+\DeclareOption{oldstyle} {\kp at ostrue\kp at Qtailtrue}
+\DeclareOption{oldstylemath} {\kp at osmtrue}
+\DeclareOption{oldstylenumsmath} {\kp at osnmtrue}
+\DeclareOption{fulloldstylenums} {\kp at osntrue\kp at osnmtrue}
+\DeclareOption{fulloldstyle} {\kp at ostrue\kp at osmtrue\kp at Qtailtrue}
+\DeclareOption{veryoldstyle} {\kp at vostrue\kp at Qtailtrue}
+\DeclareOption{veryoldstylemath} {\kp at vosmtrue}
+\DeclareOption{fullveryoldstyle} {\kp at vostrue\kp at vosmtrue\kp at Qtailtrue}
+\DeclareOption{light} {\kp at lighttexttrue\kp at lightmathtrue}
+\DeclareOption{lighttext} {\kp at lighttexttrue}
+\DeclareOption{lightmath} {\kp at lightmathtrue}
+\DeclareOption{rmx} {\kp at rmxtrue}
+\DeclareOption{nowarning} {\kp at warningfalse}
+\DeclareOption{noamsmath} {\kp at amsmathfalse}
+\DeclareOption{notextcomp} {\kp at textcompfalse}
+\DeclareOption{narrowiints} {\kp at narrowiintstrue}
+\DeclareOption{partialup} {\kp at partialuptrue}
+\DeclareOption{largesmallcaps} {\kp at largesmallcapstrue}
+\DeclareOption{easyscsl} {\kp at easyscsltrue}
+\DeclareOption{noDcommand} {\kp at Dcommandfalse}
+\DeclareOption{nofligatures} {\kp at nofligaturestrue}
+\DeclareOption{widermath} {\kp at widermathtrue}
+\DeclareOption{sfmath} {\kp at sfmathtrue}
+\DeclareOption{sfmathbb} {\kp at sfmathbbtrue}
+\DeclareOption{rmmathbb} {\kp at rmmathbbtrue}
+\DeclareOption{intlimits} {\let\kp at ilimits\displaylimits}
+\DeclareOption{fullintlimits} {\let\kp at ilimits\limits}
+\DeclareOption{nointlimits} {\let\kp at ilimits\nolimits}
+\DeclareOption{sumlimits} {\let\kp at slimits\displaylimits}
+\DeclareOption{fullsumlimits} {\let\kp at slimits\limits}
+\DeclareOption{nosumlimits} {\let\kp at 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 at text\ifkp at textcomp\RequirePackage[full]{textcomp}\fi\fi
+\ifkp at math\ifkp at amsmath\RequirePackage{amsmath}\fi\fi
+\ifkp at text\ifkp at easyscsl\RequirePackage{ifthen}\fi\fi
+
+\renewcommand{\bfdefault}{b}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Stupid oldstyle options %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\ifkp at osn\ifkp at os\kp at osnfalse\fi\fi
+\ifkp at osn\ifkp at vos\kp at osnfalse\fi\fi
+\ifkp at os\ifkp at vos\kp at osfalse\fi\fi
+\ifkp at os\ifkp at nofligatures\kp at nofligaturesfalse\fi\fi
+\ifkp at vos\ifkp at nofligatures\kp at nofligaturesfalse\fi\fi
+
+\ifkp at osnm\ifkp at osm\kp at osnmfalse\fi\fi
+\ifkp at osnm\ifkp at vosm\kp at osnmfalse\fi\fi
+\ifkp at osm\ifkp at vosm\kp at osmfalse\fi\fi
+
+\ifkp at math\else\kp at osnmfalse\kp at osmfalse\kp at vosmfalse\fi
+\ifkp at text\else\kp at osnfalse\kp at osfalse\kp at vosfalse\fi
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Stupid \mathbb options %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\ifkp at sfmathbb\ifkp at rmmathbb
+ \kp at sfmathbbfalse\kp at rmmathbbfalse
+ \PackageError{kpfonts}%
+ {'sfmathbb' and 'rmmathbb' options are incompatible and ignored}
+\fi\fi
+
+%%%%%%%%
+% Text %
+%%%%%%%%
+
+\ifkp at text
+ \ifkp at warning
+ \ifkp at 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 at 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 at easyscsl
+%%% To prevent this warning, use the 'nowarning' option %%%
+ \PackageWarning{kpfonts}%
+ {With 'easyscsl' option, don't fit together\MessageBreak
+ \textsl or \slshape and \textsc or \scshape\MessageBreak
+ with non 'kpfonts' fonts.}
+%%% To prevent this warning, use the 'nowarning' option %%%
+ \fi % end vos
+ \fi % end warning
+%
+%%% easyscsl, courtesy from Fran\xE7ois P\xE9tiard
+%
+ \ifkp at easyscsl
+ \renewcommand{\itshape}{\not at math@alphabet\itshape\mathit%
+ \ifthenelse{\equal{\f at shape}{\scdefault}}{\fontshape{scsl}}{%
+ \fontshape\itdefault}\selectfont}
+ \renewcommand{\scshape}{\not at math@alphabet\scshape\relax%
+ \ifthenelse{\equal{\f at shape}{\sldefault}}{\fontshape{scsl}}{%
+ \ifthenelse{\equal{\f at shape}{\itdefault}}{\fontshape{scsl}}{\fontshape\scdefault}}\selectfont}
+ \renewcommand{\slshape}{\not at math@alphabet\slshape\relax%
+ \ifthenelse{\equal{\f at shape}{\scdefault}}{\fontshape{scsl}}{%
+ \fontshape\sldefault}\selectfont}
+ \fi
+%
+%%% famille, petitesmajuscules, style, f-ligatures and Q tail
+%
+ \ifkp at rmx\def\kp at famille{x}
+ \else
+ \ifkp at lighttext\def\kp at famille{l}
+ \else\def\kp at famille{}
+ \fi\fi
+ \ifkp at vos\def\kp at style{vos}
+ \else\ifkp at os\def\kp at style{os}
+ \else\ifkp at osn\def\kp at style{osn}
+ \else\def\kp at style{}
+ \fi\fi\fi
+ \ifkp at largesmallcaps\def\kp at petitesmajuscules{k}\def\kp at othersc{}
+ \else\def\kp at petitesmajuscules{}\def\kp at othersc{k}
+ \fi
+ \ifkp at nofligatures\def\kp at flig{f}
+ \else\def\kp at flig{}
+ \fi
+ \ifkp at Qtail\def\kp at othertail{}
+ \else\def\kp at othertail{os}
+ \fi
+ \ifkp at vos\def\kp at otherctst{}
+ \else\ifkp at os\def\kp at otherctst{}
+ \else\def\kp at otherctst{os}
+ \fi\fi
+%
+%%% start rm
+%
+ \renewcommand{\rmdefault}{jkp\kp at famille\kp at petitesmajuscules\kp at flig\kp at style}
+%
+%%% start sf
+%
+ \ifkp at sf
+ \renewcommand{\sfdefault}{jkpss\kp at petitesmajuscules\kp at flig\kp at style}
+ \fi
+%
+%%% start tt
+%
+ \ifkp at tt
+ \renewcommand{\ttdefault}{jkptt\kp at 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 at othersc\kp at flig\kp at style}}{%
+ \fontfamily{jkp\kp at famille\kp at othersc\kp at flig\kp at style}}}%
+ \fontshape{sc}\selectfont%
+ \ifkp at largesmallcaps\kp at largesmallcapsfalse\else\kp at largesmallcapstrue\fi%
+ \ifkp at largesmallcaps\def\kp at petitesmajuscules{k}\def\kp at othersc{}%
+ \else\def\kp at petitesmajuscules{}\def\kp at 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 at othersc\kp at flig\kp at style}}{%
+ \fontfamily{jkp\kp at famille\kp at othersc\kp at flig\kp at style}}}%
+ \fontshape{scsl}\selectfont%
+ \ifkp at largesmallcaps\kp at largesmallcapsfalse\else\kp at largesmallcapstrue\fi%
+ \ifkp at largesmallcaps\def\kp at petitesmajuscules{k}\def\kp at othersc{}%
+ \else\def\kp at petitesmajuscules{}\def\kp at 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 at othertail}}{%
+ \fontfamily{jkp\kp at famille\kp at othertail}}}%
+ \selectfont{}Q%
+ \endgroup}
+%
+ \newcommand{\othertailscq}{%
+ \begingroup%
+ \SiFonteContient{\fontname\the\font}{tt}{}{%
+ \SiFonteContient{\fontname\the\font}{ss}{\fontfamily{jkpss\kp at petitesmajuscules\kp at othertail}}{%
+ \fontfamily{jkp\kp at famille\kp at petitesmajuscules\kp at othertail}}}%
+ \fontshape{sc}\selectfont{}q%
+ \endgroup}
+%
+ \newcommand{\othertailscslq}{%
+ \begingroup%
+ \SiFonteContient{\fontname\the\font}{tt}{}{%
+ \SiFonteContient{\fontname\the\font}{ss}{\fontfamily{jkpss\kp at petitesmajuscules\kp at othertail}}{%
+ \fontfamily{jkp\kp at famille\kp at petitesmajuscules\kp at othertail}}}%
+ \fontshape{scsl}\selectfont{}q%
+ \endgroup}
+
+%
+\fi % end text
+%
+
+
+%%%%%%%%
+% Math %
+%%%%%%%%
+
+\ifkp at math
+
+
+%
+%%% \kp at famillem \kp at stylem and \kp at widerm
+%
+
+ \ifkp at lightmath\def\kp at famillem{l}
+ \else\def\kp at famillem{}
+ \fi
+
+ \ifkp at vosm\def\kp at stylem{vos}
+ \else\ifkp at osm\def\kp at stylem{os}
+ \else\ifkp at osnm\def\kp at stylem{osn}
+ \else\def\kp at stylem{}
+ \fi\fi\fi
+ \ifkp at nofligatures\def\kp at fligm{f}
+ \else\def\kp at fligm{}
+ \fi
+
+ \ifkp at widermath\def\kp at widerm{w}
+ \else\def\kp at widerm{}
+ \fi
+ \ifkp at sfmath\def\kp at widerm{}\fi
+
+%
+%%% \kp at stylemi et \kp at stylemath
+%
+
+ \ifkp at vosm\def\kp at stylemi{vos}
+ \else\def\kp at stylemi{}\fi
+
+ \ifkp at sfmath
+ \def\kp at stylemath{ss}
+ \else
+ \def\kp at stylemath{}
+ \fi
+
+%
+%%% New math Versions
+%
+
+\DeclareMathVersion{rm}
+\DeclareMathVersion{boldrm}
+\DeclareMathVersion{sf}
+\DeclareMathVersion{boldsf}
+
+% Roman
+
+ \ifkp at sfmath
+ \DeclareSymbolFont{operators}{OT1}{jkpss\kp at fligm\kp at stylem}{m}{n}
+ \SetSymbolFont{operators}{bold}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+ \else
+ \DeclareSymbolFont{operators}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{m}{n}
+ \SetSymbolFont{operators}{bold}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \fi
+ \SetSymbolFont{operators}{rm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{m}{n}
+ \SetSymbolFont{operators}{boldrm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \SetSymbolFont{operators}{sf}{OT1}{jkpss\kp at fligm\kp at stylem}{m}{n}
+ \SetSymbolFont{operators}{boldsf}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+
+ \def\operator at font{\mathgroup\symoperators}
+
+ \DeclareMathAlphabet{\mathrm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathrm}{bold}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathrm}{rm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathrm}{boldrm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathrm}{sf}{OT1}{jkp\kp at fligm\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathrm}{boldsf}{OT1}{jkp\kp at fligm\kp at stylem}{b}{n}
+
+ \DeclareSymbolFontAlphabet{\mathupright}{operators}
+ \let\mathup\mathupright
+
+ \ifkp at sfmath
+ \DeclareMathAlphabet{\mathbf}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathbf}{bold}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+ \else
+ \DeclareMathAlphabet{\mathbf}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathbf}{bold}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \fi
+ \SetMathAlphabet{\mathbf}{rm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathbf}{boldrm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathbf}{sf}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathbf}{boldsf}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+
+ \ifkp at sfmath
+ \DeclareMathAlphabet{\mathit}{OT1}{jkpss\kp at fligm\kp at stylem}{m}{it}
+ \SetMathAlphabet{\mathit}{bold}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{it}
+ \else
+ \DeclareMathAlphabet{\mathit}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{m}{it}
+ \SetMathAlphabet{\mathit}{bold}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{it}
+ \fi
+ \SetMathAlphabet{\mathit}{rm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{m}{it}
+ \SetMathAlphabet{\mathit}{boldrm}{OT1}{jkp\kp at famillem\kp at fligm\kp at stylem}{b}{it}
+ \SetMathAlphabet{\mathit}{sf}{OT1}{jkpss\kp at fligm\kp at stylem}{m}{it}
+ \SetMathAlphabet{\mathit}{boldsf}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{it}
+
+
+% Sans Serif
+
+ \DeclareMathAlphabet{\mathsf}{OT1}{jkpss\kp at fligm\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathsf}{bold}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathsf}{rm}{OT1}{jkpss\kp at fligm\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathsf}{boldrm}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathsf}{sf}{OT1}{jkpss\kp at fligm\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathsf}{boldsf}{OT1}{jkpss\kp at fligm\kp at stylem}{b}{n}
+
+% Typewriter
+
+ \DeclareMathAlphabet{\mathtt}{OT1}{jkptt\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathtt}{bold}{OT1}{jkptt\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathtt}{rm}{OT1}{jkptt\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathtt}{boldrm}{OT1}{jkptt\kp at stylem}{b}{n}
+ \SetMathAlphabet{\mathtt}{sf}{OT1}{jkptt\kp at stylem}{m}{n}
+ \SetMathAlphabet{\mathtt}{boldsf}{OT1}{jkptt\kp at stylem}{b}{n}
+
+% Math Italic
+
+ \ifkp at sfmath
+ \DeclareSymbolFont{letters}{OML}{jkpss\kp at stylemi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{jkpss\kp at stylemi}{bx}{it}
+ \else
+ \DeclareSymbolFont{letters}{OML}{jkp\kp at famillem\kp at stylemi\kp at widerm}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{jkp\kp at famillem\kp at stylemi\kp at widerm}{bx}{it}
+ \fi
+ \SetSymbolFont{letters}{rm}{OML}{jkp\kp at famillem\kp at stylemi\kp at widerm}{m}{it}
+ \SetSymbolFont{letters}{boldrm}{OML}{jkp\kp at famillem\kp at stylemi\kp at widerm}{bx}{it}
+ \SetSymbolFont{letters}{sf}{OML}{jkpss\kp at stylemi}{m}{it}
+ \SetSymbolFont{letters}{boldsf}{OML}{jkpss\kp at stylemi}{bx}{it}
+ \DeclareFontSubstitution{OML}{jkp\kp at famillem\kp at stylemi\kp at widerm}{m}{it}
+
+% Math Italic A
+
+ \ifkp at sfmath
+ \DeclareSymbolFont{lettersA}{U}{jkpssmia}{m}{it}
+ \SetSymbolFont{lettersA}{bold}{U}{jkpssmia}{bx}{it}
+ \else
+ \DeclareSymbolFont{lettersA}{U}{jkp\kp at famillem mia\kp at widerm}{m}{it}
+ \SetSymbolFont{lettersA}{bold}{U}{jkp\kp at famillem mia\kp at widerm}{bx}{it}
+ \fi
+ \SetSymbolFont{lettersA}{rm}{U}{jkp\kp at famillem mia\kp at widerm}{m}{it}
+ \SetSymbolFont{lettersA}{boldrm}{U}{jkp\kp at famillem mia\kp at widerm}{bx}{it}
+ \SetSymbolFont{lettersA}{sf}{U}{jkpssmia}{m}{it}
+ \SetSymbolFont{lettersA}{boldsf}{U}{jkpssmia}{bx}{it}
+ \DeclareFontSubstitution{U}{jkp\kp at famillem mia\kp at widerm}{m}{it}
+
+ \DeclareSymbolFontAlphabet{\mathfrak}{lettersA}
+
+
+% Math Symbol
+
+ \ifkp at sfmath
+ \DeclareSymbolFont{symbols}{OMS}{jkp}{m}{n}
+ \SetSymbolFont{symbols}{bold}{OMS}{jkp}{bx}{n}
+ \else
+ \DeclareSymbolFont{symbols}{OMS}{jkp\kp at famillem\kp at widerm}{m}{n}
+ \SetSymbolFont{symbols}{bold}{OMS}{jkp\kp at famillem\kp at widerm}{bx}{n}
+ \fi
+ \SetSymbolFont{symbols}{rm}{OMS}{jkp\kp at famillem\kp at widerm}{m}{n}
+ \SetSymbolFont{symbols}{boldrm}{OMS}{jkp\kp at famillem\kp at widerm}{bx}{n}
+ \SetSymbolFont{symbols}{sf}{OMS}{jkp}{m}{n}
+ \SetSymbolFont{symbols}{boldsf}{OMS}{jkp}{bx}{n}
+ \DeclareFontSubstitution{OMS}{jkp\kp at famillem\kp at widerm}{m}{n}
+
+\ifkp at amsmath{
+ \renewcommand{\AmSfont}{%
+ \usefont{OMS}{jkp\kp at famillem\kp at widerm}{\if\@xp\@car\f at series\@nil bb\else m\fi}{n}}}\fi
+
+ \DeclareSymbolFontAlphabet{\symb at 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 at rmmathbb
+ \ifkp at sfmath
+ \DeclareSymbolFont{AMSb}{U}{jkpsyb}{m}{n}% rmmathbb, sfmath
+ \SetSymbolFont{AMSb}{bold}{U}{jkpsyb}{bx}{n}
+ \SetSymbolFont{AMSb}{rm}{U}{jkp\kp at famillem syb\kp at widerm}{m}{n}
+ \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{sf}{U}{jkpsyb}{m}{n}
+ \SetSymbolFont{AMSb}{boldsf}{U}{jkpsyb}{bx}{n}
+ \else
+ \DeclareSymbolFont{AMSb}{U}{jkp\kp at famillem syb\kp at widerm}{m}{n}% rmmathbb
+ \SetSymbolFont{AMSb}{bold}{U}{jkp\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{rm}{U}{jkp\kp at famillem syb\kp at widerm}{m}{n}
+ \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{sf}{U}{jkpsyb}{m}{n}
+ \SetSymbolFont{AMSb}{boldsf}{U}{jkpsyb}{bx}{n}
+ \fi
+\else
+ \ifkp at sfmathbb
+ \ifkp at sfmath
+ \DeclareSymbolFont{AMSb}{U}{jkpsssyb}{m}{n}% sfmathbb, sfmath
+ \SetSymbolFont{AMSb}{bold}{U}{jkpsssyb}{bx}{n}
+ \SetSymbolFont{AMSb}{rm}{U}{jkpss\kp at famillem syb\kp at widerm}{m}{n}
+ \SetSymbolFont{AMSb}{boldrm}{U}{jkpss\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+ \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+ \else
+ \DeclareSymbolFont{AMSb}{U}{jkpss\kp at famillem syb\kp at widerm}{m}{n}% sfmathbb
+ \SetSymbolFont{AMSb}{bold}{U}{jkpss\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{rm}{U}{jkpss\kp at famillem syb\kp at widerm}{m}{n}
+ \SetSymbolFont{AMSb}{boldrm}{U}{jkpss\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+ \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+ \fi
+ \else
+ \ifkp at sfmath
+ \DeclareSymbolFont{AMSb}{U}{jkpsssyb}{m}{n}% sfmath
+ \SetSymbolFont{AMSb}{bold}{U}{jkpsssyb}{bx}{n}
+ \SetSymbolFont{AMSb}{rm}{U}{jkp\kp at famillem syb\kp at widerm}{m}{n}
+ \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+ \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+ \else
+ \DeclareSymbolFont{AMSb}{U}{jkp\kp at famillem syb\kp at widerm}{m}{n}% default
+ \SetSymbolFont{AMSb}{bold}{U}{jkp\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{rm}{U}{jkp\kp at famillem syb\kp at widerm}{m}{n}
+ \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp at famillem syb\kp at widerm}{bx}{n}
+ \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n}
+ \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n}
+ \fi
+ \fi
+\fi
+
+ \DeclareFontSubstitution{U}{jkp\kp at famillem syb\kp at widerm}{m}{n}
+ \DeclareSymbolFontAlphabet{\mathbb}{AMSb}
+
+
+% Math Symbols C
+
+ \ifkp at sfmath
+ \DeclareSymbolFont{symbolsC}{U}{jkpsyc}{m}{n}
+ \SetSymbolFont{symbolsC}{bold}{U}{jkpsyc}{bx}{n}
+ \else
+ \DeclareSymbolFont{symbolsC}{U}{jkp\kp at famillem syc}{m}{n}
+ \SetSymbolFont{symbolsC}{bold}{U}{jkp\kp at famillem syc}{bx}{n}
+ \fi
+ \SetSymbolFont{symbolsC}{rm}{U}{jkp\kp at famillem syc}{m}{n}
+ \SetSymbolFont{symbolsC}{boldrm}{U}{jkp\kp at famillem syc}{bx}{n}
+ \SetSymbolFont{symbolsC}{sf}{U}{jkpsyc}{m}{n}
+ \SetSymbolFont{symbolsC}{boldsf}{U}{jkpsyc}{bx}{n}
+ \DeclareFontSubstitution{U}{jkp\kp at famillem syc}{m}{n}
+
+
+% Math Symbols D
+
+\ifkp at calasscr
+ \let\mathcal\undefined
+ \ifkp at sfmath
+ \DeclareMathAlphabet{\mathcal}{U}{jkpsyd}{m}{n}
+ \SetMathAlphabet{\mathcal}{bold}{U}{jkpsyd}{bx}{n}
+ \else
+ \DeclareMathAlphabet{\mathcal}{U}{jkp\kp at famillem syd\kp at widerm}{m}{n}
+ \SetMathAlphabet{\mathcal}{bold}{U}{jkp\kp at famillem syd\kp at widerm}{bx}{n}
+ \fi
+ \SetMathAlphabet{\mathcal}{rm}{U}{jkp\kp at famillem syd\kp at widerm}{m}{n}
+ \SetMathAlphabet{\mathcal}{boldrm}{U}{jkp\kp at famillem syd\kp at widerm}{bx}{n}
+ \SetMathAlphabet{\mathcal}{sf}{U}{jkpsyd}{m}{n}
+ \SetMathAlphabet{\mathcal}{boldsf}{U}{jkpsyd}{bx}{n}
+ \ifkp at mathscr
+ \DeclareSymbolFontAlphabet{\mathscr}{symbols}
+ \fi
+\else
+ \ifkp at mathscr
+ \ifkp at sfmath
+ \DeclareMathAlphabet{\mathscr}{U}{jkpsyd}{m}{n}
+ \SetMathAlphabet{\mathscr}{bold}{U}{jkpsyd}{bx}{n}
+ \else
+ \DeclareMathAlphabet{\mathscr}{U}{jkp\kp at famillem syd\kp at widerm}{m}{n}
+ \SetMathAlphabet{\mathscr}{bold}{U}{jkp\kp at famillem syd\kp at widerm}{bx}{n}
+ \fi
+ \SetMathAlphabet{\mathscr}{rm}{U}{jkp\kp at famillem syd\kp at widerm}{m}{n}
+ \SetMathAlphabet{\mathscr}{boldrm}{U}{jkp\kp at famillem syd\kp at widerm}{bx}{n}
+ \SetMathAlphabet{\mathscr}{sf}{U}{jkpsyd}{m}{n}
+ \SetMathAlphabet{\mathscr}{boldsf}{U}{jkpsyd}{bx}{n}
+ \fi
+\fi
+
+% Math Extension
+
+ \ifkp at sfmath
+ \DeclareSymbolFont{largesymbols}{OMX}{jkpss}{m}{n}
+ \SetSymbolFont{largesymbols}{bold}{OMX}{jkpss}{bx}{n}
+ \else
+ \DeclareSymbolFont{largesymbols}{OMX}{jkp\kp at famillem}{m}{n}
+ \SetSymbolFont{largesymbols}{bold}{OMX}{jkp\kp at famillem}{bx}{n}
+ \fi
+ \SetSymbolFont{largesymbols}{rm}{OMX}{jkp\kp at famillem}{m}{n}
+ \SetSymbolFont{largesymbols}{boldrm}{OMX}{jkp\kp at famillem}{bx}{n}
+ \SetSymbolFont{largesymbols}{sf}{OMX}{jkpss}{m}{n}
+ \SetSymbolFont{largesymbols}{boldsf}{OMX}{jkpss}{bx}{n}
+ \DeclareFontSubstitution{OMX}{jkp\kp at famillem}{m}{n}
+
+
+% Math Extension A
+
+ \ifkp at sfmath
+ \DeclareSymbolFont{largesymbolsA}{U}{jkpexa}{m}{n}
+ \SetSymbolFont{largesymbolsA}{bold}{U}{jkpexa}{bx}{n}
+ \else
+ \DeclareSymbolFont{largesymbolsA}{U}{jkp\kp at famillem exa}{m}{n}
+ \SetSymbolFont{largesymbolsA}{bold}{U}{jkp\kp at famillem exa}{bx}{n}
+ \fi
+ \SetSymbolFont{largesymbolsA}{rm}{U}{jkp\kp at famillem exa}{m}{n}
+ \SetSymbolFont{largesymbolsA}{boldrm}{U}{jkp\kp at famillem exa}{bx}{n}
+ \SetSymbolFont{largesymbolsA}{sf}{U}{jkpexa}{m}{n}
+ \SetSymbolFont{largesymbolsA}{boldsf}{U}{jkpexa}{bx}{n}
+ \DeclareFontSubstitution{U}{jkp\kp at 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 at 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 at DeclareMathSymbol#1#2#3#4{%
+ \let#1=\undefined
+ \DeclareMathSymbol{#1}{#2}{#3}{#4}}
+
+\def\re at DeclareMathDelimiter#1#2#3#4#5#6{%
+ \let#1=\undefined
+ \DeclareMathDelimiter{#1}{#2}{#3}{#4}{#5}{#6}}
+
+\def\re at DeclareMathAccent#1#2#3#4{%
+ \let#1=\undefined
+ \DeclareMathAccent{#1}{#2}{#3}{#4}}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Math Operator Definition %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\re at 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 at partialup\re at DeclareMathSymbol{\partial}{\mathord}{letters}{128}\fi
+\re at DeclareMathSymbol{\partialup}{\mathord}{letters}{128}
+\re at 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 at oldReIm
+ \re at DeclareMathSymbol{\Re}{\mathord}{lettersA}{82}
+ \re at DeclareMathSymbol{\Im}{\mathord}{lettersA}{73}
+\fi
+
+
+\re at DeclareMathSymbol{\varemptyset}{\mathord}{symbols}{128}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Math Symbol A Definitions % AMSa
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\re at DeclareMathSymbol{\boxdot}{\mathbin}{AMSa}{0}
+\re at DeclareMathSymbol{\boxplus}{\mathbin}{AMSa}{1}
+\re at DeclareMathSymbol{\boxtimes}{\mathbin}{AMSa}{2}
+\re at DeclareMathSymbol{\square}{\mathord}{AMSa}{3}
+\re at DeclareMathSymbol{\blacksquare}{\mathord}{AMSa}{4}
+\re at DeclareMathSymbol{\centerdot}{\mathbin}{AMSa}{5}
+\re at DeclareMathSymbol{\lozenge}{\mathord}{AMSa}{6}
+\re at DeclareMathSymbol{\blacklozenge}{\mathord}{AMSa}{7}
+\re at DeclareMathSymbol{\circlearrowright}{\mathrel}{AMSa}{8}
+\re at DeclareMathSymbol{\circlearrowleft}{\mathrel}{AMSa}{9}
+\re at DeclareMathSymbol{\rightleftharpoons}{\mathrel}{AMSa}{10}
+\re at DeclareMathSymbol{\leftrightharpoons}{\mathrel}{AMSa}{11}
+\re at DeclareMathSymbol{\boxminus}{\mathbin}{AMSa}{12}
+\re at DeclareMathSymbol{\Vdash}{\mathrel}{AMSa}{13}
+\re at DeclareMathSymbol{\Vvdash}{\mathrel}{AMSa}{14}
+\re at DeclareMathSymbol{\vDash}{\mathrel}{AMSa}{15}
+\re at DeclareMathSymbol{\twoheadrightarrow}{\mathrel}{AMSa}{16}
+\re at DeclareMathSymbol{\twoheadleftarrow}{\mathrel}{AMSa}{17}
+\re at DeclareMathSymbol{\leftleftarrows}{\mathrel}{AMSa}{18}
+\re at DeclareMathSymbol{\rightrightarrows}{\mathrel}{AMSa}{19}
+\re at DeclareMathSymbol{\upuparrows}{\mathrel}{AMSa}{20}
+\re at DeclareMathSymbol{\downdownarrows}{\mathrel}{AMSa}{21}
+\re at DeclareMathSymbol{\upharpoonright}{\mathrel}{AMSa}{22}
+ \let\restriction\upharpoonright
+\re at DeclareMathSymbol{\downharpoonright}{\mathrel}{AMSa}{23}
+\re at DeclareMathSymbol{\upharpoonleft}{\mathrel}{AMSa}{24}
+\re at DeclareMathSymbol{\downharpoonleft}{\mathrel}{AMSa}{25}
+\re at DeclareMathSymbol{\rightarrowtail}{\mathrel}{AMSa}{26}
+\re at DeclareMathSymbol{\leftarrowtail}{\mathrel}{AMSa}{27}
+\re at DeclareMathSymbol{\leftrightarrows}{\mathrel}{AMSa}{28}
+\re at DeclareMathSymbol{\rightleftarrows}{\mathrel}{AMSa}{29}
+\re at DeclareMathSymbol{\Lsh}{\mathrel}{AMSa}{30}
+\re at DeclareMathSymbol{\Rsh}{\mathrel}{AMSa}{31}
+\re at DeclareMathSymbol{\rightsquigarrow}{\mathrel}{AMSa}{32}
+\re at DeclareMathSymbol{\leftrightsquigarrow}{\mathrel}{AMSa}{33}
+\re at DeclareMathSymbol{\looparrowleft}{\mathrel}{AMSa}{34}
+\re at DeclareMathSymbol{\looparrowright}{\mathrel}{AMSa}{35}
+\re at DeclareMathSymbol{\circeq}{\mathrel}{AMSa}{36}
+\re at DeclareMathSymbol{\succsim}{\mathrel}{AMSa}{37}
+\re at DeclareMathSymbol{\gtrsim}{\mathrel}{AMSa}{38}
+\re at DeclareMathSymbol{\gtrapprox}{\mathrel}{AMSa}{39}
+\re at DeclareMathSymbol{\multimap}{\mathrel}{AMSa}{40}
+\re at DeclareMathSymbol{\therefore}{\mathrel}{AMSa}{41}
+\re at DeclareMathSymbol{\because}{\mathrel}{AMSa}{42}
+\re at DeclareMathSymbol{\doteqdot}{\mathrel}{AMSa}{43}
+ \let\Doteq\doteqdot
+\re at DeclareMathSymbol{\triangleq}{\mathrel}{AMSa}{44}
+\re at DeclareMathSymbol{\precsim}{\mathrel}{AMSa}{45}
+\re at DeclareMathSymbol{\lesssim}{\mathrel}{AMSa}{46}
+\re at DeclareMathSymbol{\lessapprox}{\mathrel}{AMSa}{47}
+\re at DeclareMathSymbol{\eqslantless}{\mathrel}{AMSa}{48}
+\re at DeclareMathSymbol{\eqslantgtr}{\mathrel}{AMSa}{49}
+\re at DeclareMathSymbol{\curlyeqprec}{\mathrel}{AMSa}{50}
+\re at DeclareMathSymbol{\curlyeqsucc}{\mathrel}{AMSa}{51}
+\re at DeclareMathSymbol{\preccurlyeq}{\mathrel}{AMSa}{52}
+\re at DeclareMathSymbol{\leqq}{\mathrel}{AMSa}{53}
+\re at DeclareMathSymbol{\leqslant}{\mathrel}{AMSa}{54}
+\re at DeclareMathSymbol{\lessgtr}{\mathrel}{AMSa}{55}
+\re at DeclareMathSymbol{\backprime}{\mathord}{AMSa}{56}
+\re at DeclareMathSymbol{\risingdotseq}{\mathrel}{AMSa}{58}
+\re at DeclareMathSymbol{\fallingdotseq}{\mathrel}{AMSa}{59}
+\re at DeclareMathSymbol{\succcurlyeq}{\mathrel}{AMSa}{60}
+\re at DeclareMathSymbol{\geqq}{\mathrel}{AMSa}{61}
+\re at DeclareMathSymbol{\geqslant}{\mathrel}{AMSa}{62}
+\re at DeclareMathSymbol{\gtrless}{\mathrel}{AMSa}{63}
+\re at DeclareMathSymbol{\sqsubset}{\mathrel}{AMSa}{64}
+\re at DeclareMathSymbol{\sqsupset}{\mathrel}{AMSa}{65}
+\re at DeclareMathSymbol{\vartriangleright}{\mathrel}{AMSa}{66}
+\re at DeclareMathSymbol{\vartriangleleft}{\mathrel}{AMSa}{67}
+\re at DeclareMathSymbol{\trianglerighteq}{\mathrel}{AMSa}{68}
+\re at DeclareMathSymbol{\trianglelefteq}{\mathrel}{AMSa}{69}
+\re at DeclareMathSymbol{\bigstar}{\mathord}{AMSa}{70}
+\re at DeclareMathSymbol{\between}{\mathrel}{AMSa}{71}
+\re at DeclareMathSymbol{\blacktriangledown}{\mathord}{AMSa}{72}
+\re at DeclareMathSymbol{\blacktriangleright}{\mathrel}{AMSa}{73}
+\re at DeclareMathSymbol{\blacktriangleleft}{\mathrel}{AMSa}{74}
+\re at DeclareMathSymbol{\vartriangle}{\mathrel}{AMSa}{77}
+\re at DeclareMathSymbol{\blacktriangle}{\mathord}{AMSa}{78}
+\re at DeclareMathSymbol{\triangledown}{\mathord}{AMSa}{79}
+\re at DeclareMathSymbol{\eqcirc}{\mathrel}{AMSa}{80}
+\re at DeclareMathSymbol{\lesseqgtr}{\mathrel}{AMSa}{81}
+\re at DeclareMathSymbol{\gtreqless}{\mathrel}{AMSa}{82}
+\re at DeclareMathSymbol{\lesseqqgtr}{\mathrel}{AMSa}{83}
+\re at DeclareMathSymbol{\gtreqqless}{\mathrel}{AMSa}{84}
+\re at DeclareMathSymbol{\Rrightarrow}{\mathrel}{AMSa}{86}
+\re at DeclareMathSymbol{\Lleftarrow}{\mathrel}{AMSa}{87}
+\re at DeclareMathSymbol{\veebar}{\mathbin}{AMSa}{89}
+\re at DeclareMathSymbol{\barwedge}{\mathbin}{AMSa}{90}
+\re at DeclareMathSymbol{\doublebarwedge}{\mathbin}{AMSa}{91}
+\re at DeclareMathSymbol{\angle}{\mathord}{AMSa}{92}
+\re at DeclareMathSymbol{\measuredangle}{\mathord}{AMSa}{93}
+\re at DeclareMathSymbol{\sphericalangle}{\mathord}{AMSa}{94}
+\re at DeclareMathSymbol{\varpropto}{\mathrel}{AMSa}{95}
+\re at DeclareMathSymbol{\smallsmile}{\mathrel}{AMSa}{96}
+\re at DeclareMathSymbol{\smallfrown}{\mathrel}{AMSa}{97}
+\re at DeclareMathSymbol{\Subset}{\mathrel}{AMSa}{98}
+\re at DeclareMathSymbol{\Supset}{\mathrel}{AMSa}{99}
+\re at DeclareMathSymbol{\Cup}{\mathbin}{AMSa}{100}
+ \let\doublecup\Cup
+\re at DeclareMathSymbol{\Cap}{\mathbin}{AMSa}{101}
+ \let\doublecap\Cap
+\re at DeclareMathSymbol{\curlywedge}{\mathbin}{AMSa}{102}
+\re at DeclareMathSymbol{\curlyvee}{\mathbin}{AMSa}{103}
+\re at DeclareMathSymbol{\leftthreetimes}{\mathbin}{AMSa}{104}
+\re at DeclareMathSymbol{\rightthreetimes}{\mathbin}{AMSa}{105}
+\re at DeclareMathSymbol{\subseteqq}{\mathrel}{AMSa}{106}
+\re at DeclareMathSymbol{\supseteqq}{\mathrel}{AMSa}{107}
+\re at DeclareMathSymbol{\bumpeq}{\mathrel}{AMSa}{108}
+\re at DeclareMathSymbol{\Bumpeq}{\mathrel}{AMSa}{109}
+\re at DeclareMathSymbol{\lll}{\mathrel}{AMSa}{110}
+ \let\llless\lll
+\re at DeclareMathSymbol{\ggg}{\mathrel}{AMSa}{111}
+ \let\gggtr\ggg
+\re at DeclareMathDelimiter\ulcorner{\mathopen}{AMSa}{112}{AMSa}{112}
+\re at DeclareMathDelimiter\urcorner{\mathclose}{AMSa}{113}{AMSa}{113}
+\re at DeclareMathSymbol{\circledS}{\mathord}{AMSa}{115}
+\re at DeclareMathSymbol{\pitchfork}{\mathrel}{AMSa}{116}
+\re at DeclareMathSymbol{\dotplus}{\mathbin}{AMSa}{117}
+\re at DeclareMathSymbol{\backsim}{\mathrel}{AMSa}{118}
+\re at DeclareMathSymbol{\backsimeq}{\mathrel}{AMSa}{119}
+\re at DeclareMathDelimiter\llcorner{\mathopen}{AMSa}{120}{AMSa}{120}
+\re at DeclareMathDelimiter\lrcorner{\mathclose}{AMSa}{121}{AMSa}{121}
+\re at DeclareMathSymbol{\complement}{\mathord}{AMSa}{123}
+\re at DeclareMathSymbol{\intercal}{\mathbin}{AMSa}{124}
+\re at DeclareMathSymbol{\circledcirc}{\mathbin}{AMSa}{125}
+\re at DeclareMathSymbol{\circledast}{\mathbin}{AMSa}{126}
+\re at DeclareMathSymbol{\circleddash}{\mathbin}{AMSa}{127}
+
+\let\Box=\square % LaTeX symbol
+\re at DeclareMathSymbol{\rhd}{\mathbin}{AMSa}{66} % LaTeX symbol
+\re at DeclareMathSymbol{\lhd}{\mathbin}{AMSa}{67} % LaTeX symbol
+\re at DeclareMathSymbol{\unrhd}{\mathbin}{AMSa}{68} % LaTeX symbol
+\re at DeclareMathSymbol{\unlhd}{\mathbin}{AMSa}{69} % LaTeX symbol
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Math Symbol B Definitions % AMSb
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\re at DeclareMathSymbol{\lvertneqq}{\mathrel}{AMSb}{0}
+\re at DeclareMathSymbol{\gvertneqq}{\mathrel}{AMSb}{1}
+\re at DeclareMathSymbol{\nleq}{\mathrel}{AMSb}{2}
+\re at DeclareMathSymbol{\ngeq}{\mathrel}{AMSb}{3}
+\re at DeclareMathSymbol{\nless}{\mathrel}{AMSb}{4}
+\re at DeclareMathSymbol{\ngtr}{\mathrel}{AMSb}{5}
+\re at DeclareMathSymbol{\nprec}{\mathrel}{AMSb}{6}
+\re at DeclareMathSymbol{\nsucc}{\mathrel}{AMSb}{7}
+\re at DeclareMathSymbol{\lneqq}{\mathrel}{AMSb}{8}
+\re at DeclareMathSymbol{\gneqq}{\mathrel}{AMSb}{9}
+\re at DeclareMathSymbol{\nleqslant}{\mathrel}{AMSb}{10}
+\re at DeclareMathSymbol{\ngeqslant}{\mathrel}{AMSb}{11}
+\re at DeclareMathSymbol{\lneq}{\mathrel}{AMSb}{12}
+\re at DeclareMathSymbol{\gneq}{\mathrel}{AMSb}{13}
+\re at DeclareMathSymbol{\npreceq}{\mathrel}{AMSb}{14}
+\re at DeclareMathSymbol{\nsucceq}{\mathrel}{AMSb}{15}
+\re at DeclareMathSymbol{\precnsim}{\mathrel}{AMSb}{16}
+\re at DeclareMathSymbol{\succnsim}{\mathrel}{AMSb}{17}
+\re at DeclareMathSymbol{\lnsim}{\mathrel}{AMSb}{18}
+\re at DeclareMathSymbol{\gnsim}{\mathrel}{AMSb}{19}
+\re at DeclareMathSymbol{\nleqq}{\mathrel}{AMSb}{20}
+\re at DeclareMathSymbol{\ngeqq}{\mathrel}{AMSb}{21}
+\re at DeclareMathSymbol{\precneqq}{\mathrel}{AMSb}{22}
+\re at DeclareMathSymbol{\succneqq}{\mathrel}{AMSb}{23}
+\re at DeclareMathSymbol{\precnapprox}{\mathrel}{AMSb}{24}
+\re at DeclareMathSymbol{\succnapprox}{\mathrel}{AMSb}{25}
+\re at DeclareMathSymbol{\lnapprox}{\mathrel}{AMSb}{26}
+\re at DeclareMathSymbol{\gnapprox}{\mathrel}{AMSb}{27}
+\re at DeclareMathSymbol{\nsim}{\mathrel}{AMSb}{28}
+\re at DeclareMathSymbol{\ncong}{\mathrel}{AMSb}{29}
+\re at DeclareMathSymbol{\diagup}{\mathord}{AMSb}{30}
+\re at DeclareMathSymbol{\diagdown}{\mathord}{AMSb}{31}
+\re at DeclareMathSymbol{\varsubsetneq}{\mathrel}{AMSb}{32}
+\re at DeclareMathSymbol{\varsupsetneq}{\mathrel}{AMSb}{33}
+\re at DeclareMathSymbol{\nsubseteqq}{\mathrel}{AMSb}{34}
+\re at DeclareMathSymbol{\nsupseteqq}{\mathrel}{AMSb}{35}
+\re at DeclareMathSymbol{\subsetneqq}{\mathrel}{AMSb}{36}
+\re at DeclareMathSymbol{\supsetneqq}{\mathrel}{AMSb}{37}
+\re at DeclareMathSymbol{\varsubsetneqq}{\mathrel}{AMSb}{38}
+\re at DeclareMathSymbol{\varsupsetneqq}{\mathrel}{AMSb}{39}
+\re at DeclareMathSymbol{\subsetneq}{\mathrel}{AMSb}{40}
+\re at DeclareMathSymbol{\supsetneq}{\mathrel}{AMSb}{41}
+\re at DeclareMathSymbol{\nsubseteq}{\mathrel}{AMSb}{42}
+\re at DeclareMathSymbol{\nsupseteq}{\mathrel}{AMSb}{43}
+\re at DeclareMathSymbol{\nparallel}{\mathrel}{AMSb}{44}
+\re at DeclareMathSymbol{\nmid}{\mathrel}{AMSb}{45}
+\re at DeclareMathSymbol{\nshortmid}{\mathrel}{AMSb}{46}
+\re at DeclareMathSymbol{\nshortparallel}{\mathrel}{AMSb}{47}
+\re at DeclareMathSymbol{\nvdash}{\mathrel}{AMSb}{48}
+\re at DeclareMathSymbol{\nVdash}{\mathrel}{AMSb}{49}
+\re at DeclareMathSymbol{\nvDash}{\mathrel}{AMSb}{50}
+\re at DeclareMathSymbol{\nVDash}{\mathrel}{AMSb}{51}
+\re at DeclareMathSymbol{\ntrianglerighteq}{\mathrel}{AMSb}{52}
+\re at DeclareMathSymbol{\ntrianglelefteq}{\mathrel}{AMSb}{53}
+\re at DeclareMathSymbol{\ntriangleleft}{\mathrel}{AMSb}{54}
+\re at DeclareMathSymbol{\ntriangleright}{\mathrel}{AMSb}{55}
+\re at DeclareMathSymbol{\nleftarrow}{\mathrel}{AMSb}{56}
+\re at DeclareMathSymbol{\nrightarrow}{\mathrel}{AMSb}{57}
+\re at DeclareMathSymbol{\nLeftarrow}{\mathrel}{AMSb}{58}
+\re at DeclareMathSymbol{\nRightarrow}{\mathrel}{AMSb}{59}
+\re at DeclareMathSymbol{\nLeftrightarrow}{\mathrel}{AMSb}{60}
+\re at DeclareMathSymbol{\nleftrightarrow}{\mathrel}{AMSb}{61}
+\re at DeclareMathSymbol{\divideontimes}{\mathbin}{AMSb}{62}
+\re at DeclareMathSymbol{\varnothing}{\mathord}{AMSb}{63}
+\re at DeclareMathSymbol{\nexists}{\mathord}{AMSb}{64}
+\re at DeclareMathSymbol{\Finv}{\mathord}{AMSb}{96}
+\re at DeclareMathSymbol{\Game}{\mathord}{AMSb}{97}
+\re at DeclareMathSymbol{\mho}{\mathord}{AMSb}{102}
+\re at DeclareMathSymbol{\eth}{\mathord}{AMSb}{103}
+\re at DeclareMathSymbol{\eqsim}{\mathrel}{AMSb}{104}
+\re at DeclareMathSymbol{\beth}{\mathord}{AMSb}{105}
+\re at DeclareMathSymbol{\gimel}{\mathord}{AMSb}{106}
+\re at DeclareMathSymbol{\daleth}{\mathord}{AMSb}{107}
+\re at DeclareMathSymbol{\lessdot}{\mathbin}{AMSb}{108}
+\re at DeclareMathSymbol{\gtrdot}{\mathbin}{AMSb}{109}
+\re at DeclareMathSymbol{\ltimes}{\mathbin}{AMSb}{110}
+\re at DeclareMathSymbol{\rtimes}{\mathbin}{AMSb}{111}
+\re at DeclareMathSymbol{\shortmid}{\mathrel}{AMSb}{112}
+\re at DeclareMathSymbol{\shortparallel}{\mathrel}{AMSb}{113}
+\re at DeclareMathSymbol{\smallsetminus}{\mathbin}{AMSb}{114}
+\re at DeclareMathSymbol{\thicksim}{\mathrel}{AMSb}{115}
+\re at DeclareMathSymbol{\thickapprox}{\mathrel}{AMSb}{116}
+\re at DeclareMathSymbol{\approxeq}{\mathrel}{AMSb}{117}
+\re at DeclareMathSymbol{\succapprox}{\mathrel}{AMSb}{119}
+\re at DeclareMathSymbol{\precapprox}{\mathrel}{AMSb}{118}
+\re at DeclareMathSymbol{\curvearrowleft}{\mathrel}{AMSb}{120}
+\re at DeclareMathSymbol{\curvearrowright}{\mathrel}{AMSb}{121}
+\re at DeclareMathSymbol{\digamma}{\mathord}{AMSb}{122}
+\re at DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}
+\re at DeclareMathSymbol{\Bbbk}{\mathord}{AMSb}{124}
+\re at DeclareMathSymbol{\hslash}{\mathord}{AMSb}{125}
+\re at DeclareMathSymbol{\hbar}{\mathord}{AMSb}{126}
+\re at DeclareMathSymbol{\backepsilon}{\mathrel}{AMSb}{127}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Math Symbol C Definitions % symbolsC
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\re at DeclareMathSymbol{\mappedfromchar}{\mathrel}{symbolsC}{0}
+ \def\mappedfrom{\leftarrow\mappedfromchar}
+ \def\longmappedfrom{\longleftarrow\mappedfromchar}
+\re at DeclareMathSymbol{\Mapstochar}{\mathrel}{symbolsC}{1}
+ \def\Mapsto{\Mapstochar\Rightarrow}
+ \def\Longmapsto{\Mapstochar\Longrightarrow}
+\re at DeclareMathSymbol{\Mappedfromchar}{\mathrel}{symbolsC}{2}
+ \def\Mappedfrom{\Leftarrow\Mappedfromchar}
+ \def\Longmappedfrom{\Longleftarrow\Mappedfromchar}
+\re at DeclareMathSymbol{\mmapstochar}{\mathrel}{symbolsC}{3}
+ \def\mmapsto{\mmapstochar\rightarrow}
+ \def\longmmapsto{\mmapstochar\longrightarrow}
+\re at DeclareMathSymbol{\mmappedfromchar}{\mathrel}{symbolsC}{4}
+ \def\mmappedfrom{\leftarrow\mmappedfromchar}
+ \def\longmmappedfrom{\longleftarrow\mmappedfromchar}
+\re at DeclareMathSymbol{\Mmapstochar}{\mathrel}{symbolsC}{5}
+ \def\Mmapsto{\Mmapstochar\Rightarrow}
+ \def\Longmmapsto{\Mmapstochar\Longrightarrow}
+\re at DeclareMathSymbol{\Mmappedfromchar}{\mathrel}{symbolsC}{6}
+ \def\Mmappedfrom{\Leftarrow\Mmappedfromchar}
+ \def\Longmmappedfrom{\Longleftarrow\Mmappedfromchar}
+\re at DeclareMathSymbol{\medcirc}{\mathbin}{symbolsC}{7}
+\re at DeclareMathSymbol{\medbullet}{\mathbin}{symbolsC}{8}
+\re at DeclareMathSymbol{\varparallel}{\mathrel}{symbolsC}{9}
+\re at DeclareMathSymbol{\varparallelinv}{\mathrel}{symbolsC}{10}
+\re at DeclareMathSymbol{\nvarparallel}{\mathrel}{symbolsC}{11}
+\re at DeclareMathSymbol{\nvarparallelinv}{\mathrel}{symbolsC}{12}
+\re at DeclareMathSymbol{\colonapprox}{\mathrel}{symbolsC}{13}
+\re at DeclareMathSymbol{\colonsim}{\mathrel}{symbolsC}{14}
+\re at DeclareMathSymbol{\Colonapprox}{\mathrel}{symbolsC}{15}
+\re at DeclareMathSymbol{\Colonsim}{\mathrel}{symbolsC}{16}
+\re at DeclareMathSymbol{\doteq}{\mathrel}{symbolsC}{17}
+\re at DeclareMathSymbol{\multimapinv}{\mathrel}{symbolsC}{18}
+\re at DeclareMathSymbol{\multimapboth}{\mathrel}{symbolsC}{19}
+\re at DeclareMathSymbol{\multimapdot}{\mathrel}{symbolsC}{20}
+\re at DeclareMathSymbol{\multimapdotinv}{\mathrel}{symbolsC}{21}
+\re at DeclareMathSymbol{\multimapdotboth}{\mathrel}{symbolsC}{22}
+\re at DeclareMathSymbol{\multimapdotbothA}{\mathrel}{symbolsC}{23}
+\re at DeclareMathSymbol{\multimapdotbothB}{\mathrel}{symbolsC}{24}
+\re at DeclareMathSymbol{\VDash}{\mathrel}{symbolsC}{25}
+\re at DeclareMathSymbol{\VvDash}{\mathrel}{symbolsC}{26}
+\re at DeclareMathSymbol{\cong}{\mathrel}{symbolsC}{27}
+\re at DeclareMathSymbol{\preceqq}{\mathrel}{symbolsC}{28}
+\re at DeclareMathSymbol{\succeqq}{\mathrel}{symbolsC}{29}
+\re at DeclareMathSymbol{\nprecsim}{\mathrel}{symbolsC}{30}
+\re at DeclareMathSymbol{\nsuccsim}{\mathrel}{symbolsC}{31}
+\re at DeclareMathSymbol{\nlesssim}{\mathrel}{symbolsC}{32}
+\re at DeclareMathSymbol{\ngtrsim}{\mathrel}{symbolsC}{33}
+\re at DeclareMathSymbol{\nlessapprox}{\mathrel}{symbolsC}{34}
+\re at DeclareMathSymbol{\ngtrapprox}{\mathrel}{symbolsC}{35}
+\re at DeclareMathSymbol{\npreccurlyeq}{\mathrel}{symbolsC}{36}
+\re at DeclareMathSymbol{\nsucccurlyeq}{\mathrel}{symbolsC}{37}
+\re at DeclareMathSymbol{\ngtrless}{\mathrel}{symbolsC}{38}
+\re at DeclareMathSymbol{\nlessgtr}{\mathrel}{symbolsC}{39}
+\re at DeclareMathSymbol{\nbumpeq}{\mathrel}{symbolsC}{40}
+\re at DeclareMathSymbol{\nBumpeq}{\mathrel}{symbolsC}{41}
+\re at DeclareMathSymbol{\nbacksim}{\mathrel}{symbolsC}{42}
+\re at DeclareMathSymbol{\nbacksimeq}{\mathrel}{symbolsC}{43}
+\re at DeclareMathSymbol{\neq}{\mathrel}{symbolsC}{44}
+ \let\ne=\neq
+\re at DeclareMathSymbol{\nasymp}{\mathrel}{symbolsC}{45}
+\re at DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46}
+\re at DeclareMathSymbol{\nsim}{\mathrel}{symbolsC}{47}
+\re at DeclareMathSymbol{\napprox}{\mathrel}{symbolsC}{48}
+\re at DeclareMathSymbol{\nsubset}{\mathrel}{symbolsC}{49}
+\re at DeclareMathSymbol{\nsupset}{\mathrel}{symbolsC}{50}
+\re at DeclareMathSymbol{\nll}{\mathrel}{symbolsC}{51}
+\re at DeclareMathSymbol{\ngg}{\mathrel}{symbolsC}{52}
+\re at DeclareMathSymbol{\nthickapprox}{\mathrel}{symbolsC}{53}
+\re at DeclareMathSymbol{\napproxeq}{\mathrel}{symbolsC}{54}
+\re at DeclareMathSymbol{\nprecapprox}{\mathrel}{symbolsC}{55}
+\re at DeclareMathSymbol{\nsuccapprox}{\mathrel}{symbolsC}{56}
+\re at DeclareMathSymbol{\npreceqq}{\mathrel}{symbolsC}{57}
+\re at DeclareMathSymbol{\nsucceqq}{\mathrel}{symbolsC}{58}
+\re at DeclareMathSymbol{\nsimeq}{\mathrel}{symbolsC}{59}
+\re at DeclareMathSymbol{\notin}{\mathrel}{symbolsC}{60}
+\re at DeclareMathSymbol{\notni}{\mathrel}{symbolsC}{61}
+ \let\notowns=\notni
+\re at DeclareMathSymbol{\nSubset}{\mathrel}{symbolsC}{62}
+\re at DeclareMathSymbol{\nSupset}{\mathrel}{symbolsC}{63}
+\re at DeclareMathSymbol{\nsqsubseteq}{\mathrel}{symbolsC}{64}
+\re at DeclareMathSymbol{\nsqsupseteq}{\mathrel}{symbolsC}{65}
+\re at DeclareMathSymbol{\coloneqq}{\mathrel}{symbolsC}{66}
+\re at DeclareMathSymbol{\eqqcolon}{\mathrel}{symbolsC}{67}
+\re at DeclareMathSymbol{\coloneq}{\mathrel}{symbolsC}{68}
+\re at DeclareMathSymbol{\eqcolon}{\mathrel}{symbolsC}{69}
+\re at DeclareMathSymbol{\Coloneqq}{\mathrel}{symbolsC}{70}
+\re at DeclareMathSymbol{\Eqqcolon}{\mathrel}{symbolsC}{71}
+\re at DeclareMathSymbol{\Coloneq}{\mathrel}{symbolsC}{72}
+\re at DeclareMathSymbol{\Eqcolon}{\mathrel}{symbolsC}{73}
+\re at DeclareMathSymbol{\strictif}{\mathrel}{symbolsC}{74}
+\re at DeclareMathSymbol{\strictfi}{\mathrel}{symbolsC}{75}
+\re at DeclareMathSymbol{\strictiff}{\mathrel}{symbolsC}{76}
+\re at DeclareMathSymbol{\invamp}{\mathbin}{symbolsC}{77}
+\re at DeclareMathDelimiter{\lbag}{\mathopen}{symbolsC}{78}{largesymbolsA}{48}
+\re at DeclareMathDelimiter{\rbag}{\mathclose}{symbolsC}{79}{largesymbolsA}{49}
+\re at DeclareMathSymbol{\Lbag}{\mathopen}{symbolsC}{80}
+\re at DeclareMathSymbol{\Rbag}{\mathclose}{symbolsC}{81}
+\re at DeclareMathSymbol{\circledless}{\mathrel}{symbolsC}{82}
+\re at DeclareMathSymbol{\circledgtr}{\mathrel}{symbolsC}{83}
+\re at DeclareMathSymbol{\circledwedge}{\mathbin}{symbolsC}{84}
+\re at DeclareMathSymbol{\circledvee}{\mathbin}{symbolsC}{85}
+\re at DeclareMathSymbol{\circledbar}{\mathbin}{symbolsC}{86}
+\re at DeclareMathSymbol{\circledbslash}{\mathbin}{symbolsC}{87}
+\re at DeclareMathSymbol{\lJoin}{\mathrel}{symbolsC}{88}
+\re at DeclareMathSymbol{\rJoin}{\mathrel}{symbolsC}{89}
+\re at DeclareMathSymbol{\Join}{\mathrel}{symbolsC}{90}
+ \let\lrJoin=\Join
+\re at DeclareMathSymbol{\openJoin}{\mathrel}{symbolsC}{91}
+\re at DeclareMathSymbol{\lrtimes}{\mathrel}{symbolsC}{92}
+% \let\bowtie\lrtimes
+\re at DeclareMathSymbol{\opentimes}{\mathrel}{symbolsC}{93}
+\re at DeclareMathSymbol{\Diamond}{\mathord}{symbolsC}{94}
+\re at DeclareMathSymbol{\Diamondblack}{\mathord}{symbolsC}{95}
+\re at DeclareMathSymbol{\nplus}{\mathbin}{symbolsC}{96}
+\re at DeclareMathSymbol{\nsqsubset}{\mathrel}{symbolsC}{97}
+\re at DeclareMathSymbol{\nsqsupset}{\mathrel}{symbolsC}{98}
+\re at DeclareMathSymbol{\dashleftarrow}{\mathrel}{symbolsC}{99}
+\re at DeclareMathSymbol{\dashrightarrow}{\mathrel}{symbolsC}{100}
+ \let\dasharrow\dashrightarrow
+\re at DeclareMathSymbol{\dashleftrightarrow}{\mathrel}{symbolsC}{101}
+\re at DeclareMathSymbol{\leftsquigarrow}{\mathrel}{symbolsC}{102}
+\re at DeclareMathSymbol{\ntwoheadrightarrow}{\mathrel}{symbolsC}{103}
+\re at DeclareMathSymbol{\ntwoheadleftarrow}{\mathrel}{symbolsC}{104}
+\re at DeclareMathSymbol{\boxast}{\mathbin}{symbolsC}{105}
+\re at DeclareMathSymbol{\boxbslash}{\mathbin}{symbolsC}{106}
+\re at DeclareMathSymbol{\boxbar}{\mathbin}{symbolsC}{107}
+\re at DeclareMathSymbol{\boxslash}{\mathbin}{symbolsC}{108}
+\re at DeclareMathSymbol{\Wr}{\mathbin}{symbolsC}{109}
+\re at DeclareMathSymbol{\lambdaslash}{\mathord}{symbolsC}{110}
+\re at DeclareMathSymbol{\lambdabar}{\mathord}{symbolsC}{111}
+\re at DeclareMathSymbol{\varclubsuit}{\mathord}{symbolsC}{112}
+\re at DeclareMathSymbol{\vardiamondsuit}{\mathord}{symbolsC}{113}
+\re at DeclareMathSymbol{\varheartsuit}{\mathord}{symbolsC}{114}
+\re at DeclareMathSymbol{\varspadesuit}{\mathord}{symbolsC}{115}
+\re at DeclareMathSymbol{\Nearrow}{\mathrel}{symbolsC}{116}
+\re at DeclareMathSymbol{\Searrow}{\mathrel}{symbolsC}{117}
+\re at DeclareMathSymbol{\Nwarrow}{\mathrel}{symbolsC}{118}
+\re at DeclareMathSymbol{\Swarrow}{\mathrel}{symbolsC}{119}
+\re at DeclareMathSymbol{\Top}{\mathord}{symbolsC}{120}
+\re at DeclareMathSymbol{\Bot}{\mathord}{symbolsC}{121}
+\re at DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121}
+\re at DeclareMathSymbol\leadstoext{\mathrel}{symbolsC}{122}
+\re at DeclareMathSymbol\leadsto{\mathrel}{symbolsC}{123}
+\re at DeclareMathSymbol{\sqcupplus}{\mathbin}{symbolsC}{124}
+\re at DeclareMathSymbol{\sqcapplus}{\mathbin}{symbolsC}{125}
+\re at DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18}
+\re at DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19}
+\re at DeclareMathSymbol{\boxright}{\mathrel}{symbolsC}{128}
+\re at DeclareMathSymbol{\boxleft}{\mathrel}{symbolsC}{129}
+\re at DeclareMathSymbol{\boxdotright}{\mathrel}{symbolsC}{130}
+\re at DeclareMathSymbol{\boxdotleft}{\mathrel}{symbolsC}{131}
+\re at DeclareMathSymbol{\Diamondright}{\mathrel}{symbolsC}{132}
+\re at DeclareMathSymbol{\Diamondleft}{\mathrel}{symbolsC}{133}
+\re at DeclareMathSymbol{\Diamonddotright}{\mathrel}{symbolsC}{134}
+\re at DeclareMathSymbol{\Diamonddotleft}{\mathrel}{symbolsC}{135}
+\re at DeclareMathSymbol{\boxRight}{\mathrel}{symbolsC}{136}
+\re at DeclareMathSymbol{\boxLeft}{\mathrel}{symbolsC}{137}
+\re at DeclareMathSymbol{\boxdotRight}{\mathrel}{symbolsC}{138}
+\re at DeclareMathSymbol{\boxdotLeft}{\mathrel}{symbolsC}{139}
+\re at DeclareMathSymbol{\DiamondRight}{\mathrel}{symbolsC}{140}
+\re at DeclareMathSymbol{\DiamondLeft}{\mathrel}{symbolsC}{141}
+\re at DeclareMathSymbol{\DiamonddotRight}{\mathrel}{symbolsC}{142}
+\re at DeclareMathSymbol{\DiamonddotLeft}{\mathrel}{symbolsC}{143}
+\re at DeclareMathSymbol{\Diamonddot}{\mathord}{symbolsC}{144}
+\re at DeclareMathSymbol{\circleright}{\mathrel}{symbolsC}{145}
+\re at DeclareMathSymbol{\circleleft}{\mathrel}{symbolsC}{146}
+\re at DeclareMathSymbol{\circleddotright}{\mathrel}{symbolsC}{147}
+ \let\circledotright\circleddotright
+\re at DeclareMathSymbol{\circleddotleft}{\mathrel}{symbolsC}{148}
+ \let\circledotleft\circleddotleft
+\re at DeclareMathSymbol{\multimapbothvert}{\mathrel}{symbolsC}{149}
+\re at DeclareMathSymbol{\multimapdotbothvert}{\mathrel}{symbolsC}{150}
+\re at DeclareMathSymbol{\multimapdotbothBvert}{\mathrel}{symbolsC}{151}
+\re at DeclareMathSymbol{\multimapdotbothAvert}{\mathrel}{symbolsC}{152}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Greek letter's options %
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Absolute reference
+
+\re at DeclareMathSymbol{\Gammasl}{\mathord}{letters}{0}
+\re at DeclareMathSymbol{\Deltasl}{\mathord}{letters}{1}
+\re at DeclareMathSymbol{\Thetasl}{\mathord}{letters}{2}
+\re at DeclareMathSymbol{\Lambdasl}{\mathord}{letters}{3}
+\re at DeclareMathSymbol{\Xisl}{\mathord}{letters}{4}
+\re at DeclareMathSymbol{\Pisl}{\mathord}{letters}{5}
+\re at DeclareMathSymbol{\Sigmasl}{\mathord}{letters}{6}
+\re at DeclareMathSymbol{\Upsilonsl}{\mathord}{letters}{7}
+\re at DeclareMathSymbol{\Phisl}{\mathord}{letters}{8}
+\re at DeclareMathSymbol{\Psisl}{\mathord}{letters}{9}
+\re at DeclareMathSymbol{\Omegasl}{\mathord}{letters}{10}
+
+\re at DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{00}
+\re at DeclareMathSymbol{\Deltaup}{\mathalpha}{lettersA}{01}
+\re at DeclareMathSymbol{\Thetaup}{\mathalpha}{lettersA}{02}
+\re at DeclareMathSymbol{\Lambdaup}{\mathalpha}{lettersA}{03}
+\re at DeclareMathSymbol{\Xiup}{\mathalpha}{lettersA}{04}
+\re at DeclareMathSymbol{\Piup}{\mathalpha}{lettersA}{05}
+\re at DeclareMathSymbol{\Sigmaup}{\mathalpha}{lettersA}{06}
+\re at DeclareMathSymbol{\Upsilonup}{\mathalpha}{lettersA}{07}
+\re at DeclareMathSymbol{\Phiup}{\mathalpha}{lettersA}{08}
+\re at DeclareMathSymbol{\Psiup}{\mathalpha}{lettersA}{09}
+\re at DeclareMathSymbol{\Omegaup}{\mathalpha}{lettersA}{10}
+
+\re at DeclareMathSymbol{\alphaup}{\mathord}{lettersA}{11}
+\re at DeclareMathSymbol{\betaup}{\mathord}{lettersA}{12}
+\re at DeclareMathSymbol{\gammaup}{\mathord}{lettersA}{13}
+\re at DeclareMathSymbol{\deltaup}{\mathord}{lettersA}{14}
+\re at DeclareMathSymbol{\epsilonup}{\mathord}{lettersA}{15}
+\re at DeclareMathSymbol{\zetaup}{\mathord}{lettersA}{16}
+\re at DeclareMathSymbol{\etaup}{\mathord}{lettersA}{17}
+\re at DeclareMathSymbol{\thetaup}{\mathord}{lettersA}{18}
+\re at DeclareMathSymbol{\iotaup}{\mathord}{lettersA}{19}
+\re at DeclareMathSymbol{\kappaup}{\mathord}{lettersA}{20}
+\re at DeclareMathSymbol{\lambdaup}{\mathord}{lettersA}{21}
+\re at DeclareMathSymbol{\muup}{\mathord}{lettersA}{22}
+\re at DeclareMathSymbol{\nuup}{\mathord}{lettersA}{23}
+\re at DeclareMathSymbol{\xiup}{\mathord}{lettersA}{24}
+\re at DeclareMathSymbol{\piup}{\mathord}{lettersA}{25}
+\re at DeclareMathSymbol{\rhoup}{\mathord}{lettersA}{26}
+\re at DeclareMathSymbol{\sigmaup}{\mathord}{lettersA}{27}
+\re at DeclareMathSymbol{\tauup}{\mathord}{lettersA}{28}
+\re at DeclareMathSymbol{\upsilonup}{\mathord}{lettersA}{29}
+\re at DeclareMathSymbol{\phiup}{\mathord}{lettersA}{30}
+\re at DeclareMathSymbol{\chiup}{\mathord}{lettersA}{31}
+\re at DeclareMathSymbol{\psiup}{\mathord}{lettersA}{32}
+\re at DeclareMathSymbol{\omegaup}{\mathord}{lettersA}{33}
+\re at DeclareMathSymbol{\varepsilonup}{\mathord}{lettersA}{34}
+\re at DeclareMathSymbol{\varthetaup}{\mathord}{lettersA}{35}
+\re at DeclareMathSymbol{\varpiup}{\mathord}{lettersA}{36}
+\re at DeclareMathSymbol{\varrhoup}{\mathord}{lettersA}{37}
+\re at DeclareMathSymbol{\varsigmaup}{\mathord}{lettersA}{38}
+\re at DeclareMathSymbol{\varphiup}{\mathord}{lettersA}{39}
+
+\let\varkappaup\varkappa
+\let\digammaup\digamma
+
+\re at DeclareMathSymbol{\alphasl}{\mathord}{letters}{11}
+\re at DeclareMathSymbol{\betasl}{\mathord}{letters}{12}
+\re at DeclareMathSymbol{\gammasl}{\mathord}{letters}{13}
+\re at DeclareMathSymbol{\deltasl}{\mathord}{letters}{14}
+\re at DeclareMathSymbol{\epsilonsl}{\mathord}{letters}{15}
+\re at DeclareMathSymbol{\zetasl}{\mathord}{letters}{16}
+\re at DeclareMathSymbol{\etasl}{\mathord}{letters}{17}
+\re at DeclareMathSymbol{\thetasl}{\mathord}{letters}{18}
+\re at DeclareMathSymbol{\iotasl}{\mathord}{letters}{19}
+\re at DeclareMathSymbol{\kappasl}{\mathord}{letters}{20}
+\re at DeclareMathSymbol{\lambdasl}{\mathord}{letters}{21}
+\re at DeclareMathSymbol{\musl}{\mathord}{letters}{22}
+\re at DeclareMathSymbol{\nusl}{\mathord}{letters}{23}
+\re at DeclareMathSymbol{\xisl}{\mathord}{letters}{24}
+\re at DeclareMathSymbol{\pisl}{\mathord}{letters}{25}
+\re at DeclareMathSymbol{\rhosl}{\mathord}{letters}{26}
+\re at DeclareMathSymbol{\sigmasl}{\mathord}{letters}{27}
+\re at DeclareMathSymbol{\tausl}{\mathord}{letters}{28}
+\re at DeclareMathSymbol{\slsilonsl}{\mathord}{letters}{29}
+\re at DeclareMathSymbol{\phisl}{\mathord}{letters}{30}
+\re at DeclareMathSymbol{\chisl}{\mathord}{letters}{31}
+\re at DeclareMathSymbol{\psisl}{\mathord}{letters}{32}
+\re at DeclareMathSymbol{\omegasl}{\mathord}{letters}{33}
+\re at DeclareMathSymbol{\varepsilonsl}{\mathord}{letters}{34}
+\re at DeclareMathSymbol{\varthetasl}{\mathord}{letters}{35}
+\re at DeclareMathSymbol{\varpisl}{\mathord}{letters}{36}
+\re at DeclareMathSymbol{\varrhosl}{\mathord}{letters}{37}
+\re at DeclareMathSymbol{\varsigmasl}{\mathord}{letters}{38}
+\re at DeclareMathSymbol{\varphisl}{\mathord}{letters}{39}
+
+\let\varkappasl\varkappa
+\let\digammasl\digamma
+
+% Relative reference
+
+\ifkp at upgrk % lowercase
+
+ \re at DeclareMathSymbol{\alpha}{\mathord}{lettersA}{11}
+ \re at DeclareMathSymbol{\beta}{\mathord}{lettersA}{12}
+ \re at DeclareMathSymbol{\gamma}{\mathord}{lettersA}{13}
+ \re at DeclareMathSymbol{\delta}{\mathord}{lettersA}{14}
+ \re at DeclareMathSymbol{\epsilon}{\mathord}{lettersA}{15}
+ \re at DeclareMathSymbol{\zeta}{\mathord}{lettersA}{16}
+ \re at DeclareMathSymbol{\eta}{\mathord}{lettersA}{17}
+ \re at DeclareMathSymbol{\theta}{\mathord}{lettersA}{18}
+ \re at DeclareMathSymbol{\iota}{\mathord}{lettersA}{19}
+ \re at DeclareMathSymbol{\kappa}{\mathord}{lettersA}{20}
+ \re at DeclareMathSymbol{\lambda}{\mathord}{lettersA}{21}
+ \re at DeclareMathSymbol{\mu}{\mathord}{lettersA}{22}
+ \re at DeclareMathSymbol{\nu}{\mathord}{lettersA}{23}
+ \re at DeclareMathSymbol{\xi}{\mathord}{lettersA}{24}
+ \re at DeclareMathSymbol{\pi}{\mathord}{lettersA}{25}
+ \re at DeclareMathSymbol{\rho}{\mathord}{lettersA}{26}
+ \re at DeclareMathSymbol{\sigma}{\mathord}{lettersA}{27}
+ \re at DeclareMathSymbol{\tau}{\mathord}{lettersA}{28}
+ \re at DeclareMathSymbol{\upsilon}{\mathord}{lettersA}{29}
+ \re at DeclareMathSymbol{\phi}{\mathord}{lettersA}{30}
+ \re at DeclareMathSymbol{\chi}{\mathord}{lettersA}{31}
+ \re at DeclareMathSymbol{\psi}{\mathord}{lettersA}{32}
+ \re at DeclareMathSymbol{\omega}{\mathord}{lettersA}{33}
+ \re at DeclareMathSymbol{\varepsilon}{\mathord}{lettersA}{34}
+ \re at DeclareMathSymbol{\vartheta}{\mathord}{lettersA}{35}
+ \re at DeclareMathSymbol{\varpi}{\mathord}{lettersA}{36}
+ \re at DeclareMathSymbol{\varrho}{\mathord}{lettersA}{37}
+ \re at DeclareMathSymbol{\varsigma}{\mathord}{lettersA}{38}
+ \re at DeclareMathSymbol{\varphi}{\mathord}{lettersA}{39}
+
+ \re at DeclareMathSymbol{\otheralpha}{\mathord}{letters}{11}
+ \re at DeclareMathSymbol{\otherbeta}{\mathord}{letters}{12}
+ \re at DeclareMathSymbol{\othergamma}{\mathord}{letters}{13}
+ \re at DeclareMathSymbol{\otherdelta}{\mathord}{letters}{14}
+ \re at DeclareMathSymbol{\otherepsilon}{\mathord}{letters}{15}
+ \re at DeclareMathSymbol{\otherzeta}{\mathord}{letters}{16}
+ \re at DeclareMathSymbol{\othereta}{\mathord}{letters}{17}
+ \re at DeclareMathSymbol{\othertheta}{\mathord}{letters}{18}
+ \re at DeclareMathSymbol{\otheriota}{\mathord}{letters}{19}
+ \re at DeclareMathSymbol{\otherkappa}{\mathord}{letters}{20}
+ \re at DeclareMathSymbol{\otherlambda}{\mathord}{letters}{21}
+ \re at DeclareMathSymbol{\othermu}{\mathord}{letters}{22}
+ \re at DeclareMathSymbol{\othernu}{\mathord}{letters}{23}
+ \re at DeclareMathSymbol{\otherxi}{\mathord}{letters}{24}
+ \re at DeclareMathSymbol{\otherpi}{\mathord}{letters}{25}
+ \re at DeclareMathSymbol{\otherrho}{\mathord}{letters}{26}
+ \re at DeclareMathSymbol{\othersigma}{\mathord}{letters}{27}
+ \re at DeclareMathSymbol{\othertau}{\mathord}{letters}{28}
+ \re at DeclareMathSymbol{\otherupsilon}{\mathord}{letters}{29}
+ \re at DeclareMathSymbol{\otherphi}{\mathord}{letters}{30}
+ \re at DeclareMathSymbol{\otherchi}{\mathord}{letters}{31}
+ \re at DeclareMathSymbol{\otherpsi}{\mathord}{letters}{32}
+ \re at DeclareMathSymbol{\otheromega}{\mathord}{letters}{33}
+ \re at DeclareMathSymbol{\othervarepsilon}{\mathord}{letters}{34}
+ \re at DeclareMathSymbol{\othervartheta}{\mathord}{letters}{35}
+ \re at DeclareMathSymbol{\othervarpi}{\mathord}{letters}{36}
+ \re at DeclareMathSymbol{\othervarrho}{\mathord}{letters}{37}
+ \re at DeclareMathSymbol{\othervarsigma}{\mathord}{letters}{38}
+ \re at DeclareMathSymbol{\othervarphi}{\mathord}{letters}{39}
+
+\else
+
+ \re at DeclareMathSymbol{\alpha}{\mathord}{letters}{11}
+ \re at DeclareMathSymbol{\beta}{\mathord}{letters}{12}
+ \re at DeclareMathSymbol{\gamma}{\mathord}{letters}{13}
+ \re at DeclareMathSymbol{\delta}{\mathord}{letters}{14}
+ \re at DeclareMathSymbol{\epsilon}{\mathord}{letters}{15}
+ \re at DeclareMathSymbol{\zeta}{\mathord}{letters}{16}
+ \re at DeclareMathSymbol{\eta}{\mathord}{letters}{17}
+ \re at DeclareMathSymbol{\theta}{\mathord}{letters}{18}
+ \re at DeclareMathSymbol{\iota}{\mathord}{letters}{19}
+ \re at DeclareMathSymbol{\kappa}{\mathord}{letters}{20}
+ \re at DeclareMathSymbol{\lambda}{\mathord}{letters}{21}
+ \re at DeclareMathSymbol{\mu}{\mathord}{letters}{22}
+ \re at DeclareMathSymbol{\nu}{\mathord}{letters}{23}
+ \re at DeclareMathSymbol{\xi}{\mathord}{letters}{24}
+ \re at DeclareMathSymbol{\pi}{\mathord}{letters}{25}
+ \re at DeclareMathSymbol{\rho}{\mathord}{letters}{26}
+ \re at DeclareMathSymbol{\sigma}{\mathord}{letters}{27}
+ \re at DeclareMathSymbol{\tau}{\mathord}{letters}{28}
+ \re at DeclareMathSymbol{\upsilon}{\mathord}{letters}{29}
+ \re at DeclareMathSymbol{\phi}{\mathord}{letters}{30}
+ \re at DeclareMathSymbol{\chi}{\mathord}{letters}{31}
+ \re at DeclareMathSymbol{\psi}{\mathord}{letters}{32}
+ \re at DeclareMathSymbol{\omega}{\mathord}{letters}{33}
+ \re at DeclareMathSymbol{\varepsilon}{\mathord}{letters}{34}
+ \re at DeclareMathSymbol{\vartheta}{\mathord}{letters}{35}
+ \re at DeclareMathSymbol{\varpi}{\mathord}{letters}{36}
+ \re at DeclareMathSymbol{\varrho}{\mathord}{letters}{37}
+ \re at DeclareMathSymbol{\varsigma}{\mathord}{letters}{38}
+ \re at DeclareMathSymbol{\varphi}{\mathord}{letters}{39}
+
+ \re at DeclareMathSymbol{\otheralpha}{\mathord}{lettersA}{11}
+ \re at DeclareMathSymbol{\otherbeta}{\mathord}{lettersA}{12}
+ \re at DeclareMathSymbol{\othergamma}{\mathord}{lettersA}{13}
+ \re at DeclareMathSymbol{\otherdelta}{\mathord}{lettersA}{14}
+ \re at DeclareMathSymbol{\otherepsilon}{\mathord}{lettersA}{15}
+ \re at DeclareMathSymbol{\otherzeta}{\mathord}{lettersA}{16}
+ \re at DeclareMathSymbol{\othereta}{\mathord}{lettersA}{17}
+ \re at DeclareMathSymbol{\othertheta}{\mathord}{lettersA}{18}
+ \re at DeclareMathSymbol{\otheriota}{\mathord}{lettersA}{19}
+ \re at DeclareMathSymbol{\otherkappa}{\mathord}{lettersA}{20}
+ \re at DeclareMathSymbol{\otherlambda}{\mathord}{lettersA}{21}
+ \re at DeclareMathSymbol{\othermu}{\mathord}{lettersA}{22}
+ \re at DeclareMathSymbol{\othernu}{\mathord}{lettersA}{23}
+ \re at DeclareMathSymbol{\otherxi}{\mathord}{lettersA}{24}
+ \re at DeclareMathSymbol{\otherpi}{\mathord}{lettersA}{25}
+ \re at DeclareMathSymbol{\otherrho}{\mathord}{lettersA}{26}
+ \re at DeclareMathSymbol{\othersigma}{\mathord}{lettersA}{27}
+ \re at DeclareMathSymbol{\othertau}{\mathord}{lettersA}{28}
+ \re at DeclareMathSymbol{\otherupsilon}{\mathord}{lettersA}{29}
+ \re at DeclareMathSymbol{\otherphi}{\mathord}{lettersA}{30}
+ \re at DeclareMathSymbol{\otherchi}{\mathord}{lettersA}{31}
+ \re at DeclareMathSymbol{\otherpsi}{\mathord}{lettersA}{32}
+ \re at DeclareMathSymbol{\otheromega}{\mathord}{lettersA}{33}
+ \re at DeclareMathSymbol{\othervarepsilon}{\mathord}{lettersA}{34}
+ \re at DeclareMathSymbol{\othervartheta}{\mathord}{lettersA}{35}
+ \re at DeclareMathSymbol{\othervarpi}{\mathord}{lettersA}{36}
+ \re at DeclareMathSymbol{\othervarrho}{\mathord}{lettersA}{37}
+ \re at DeclareMathSymbol{\othervarsigma}{\mathord}{lettersA}{38}
+ \re at DeclareMathSymbol{\othervarphi}{\mathord}{lettersA}{39}
+
+\fi
+
+\let\othervarkappa\varkappa
+\let\otherdigamma\digamma
+
+\ifkp at slGrk % uppercase
+
+ \re at DeclareMathSymbol{\Gamma}{\mathord}{letters}{0}
+ \re at DeclareMathSymbol{\Delta}{\mathord}{letters}{1}
+ \re at DeclareMathSymbol{\Theta}{\mathord}{letters}{2}
+ \re at DeclareMathSymbol{\Lambda}{\mathord}{letters}{3}
+ \re at DeclareMathSymbol{\Xi}{\mathord}{letters}{4}
+ \re at DeclareMathSymbol{\Pi}{\mathord}{letters}{5}
+ \re at DeclareMathSymbol{\Sigma}{\mathord}{letters}{6}
+ \re at DeclareMathSymbol{\Upsilon}{\mathord}{letters}{7}
+ \re at DeclareMathSymbol{\Phi}{\mathord}{letters}{8}
+ \re at DeclareMathSymbol{\Psi}{\mathord}{letters}{9}
+ \re at DeclareMathSymbol{\Omega}{\mathord}{letters}{10}
+
+ \re at DeclareMathSymbol{\otherGamma}{\mathord}{lettersA}{00}
+ \re at DeclareMathSymbol{\otherDelta}{\mathord}{lettersA}{01}
+ \re at DeclareMathSymbol{\otherTheta}{\mathord}{lettersA}{02}
+ \re at DeclareMathSymbol{\otherLambda}{\mathord}{lettersA}{03}
+ \re at DeclareMathSymbol{\otherXi}{\mathord}{lettersA}{04}
+ \re at DeclareMathSymbol{\otherPi}{\mathord}{lettersA}{05}
+ \re at DeclareMathSymbol{\otherSigma}{\mathord}{lettersA}{06}
+ \re at DeclareMathSymbol{\otherUpsilon}{\mathord}{lettersA}{07}
+ \re at DeclareMathSymbol{\otherPhi}{\mathord}{lettersA}{08}
+ \re at DeclareMathSymbol{\otherPsi}{\mathord}{lettersA}{09}
+ \re at DeclareMathSymbol{\otherOmega}{\mathord}{lettersA}{10}
+
+ \re at DeclareMathSymbol{\varGamma}{\mathord}{lettersA}{00}
+ \re at DeclareMathSymbol{\varDelta}{\mathord}{lettersA}{01}
+ \re at DeclareMathSymbol{\varTheta}{\mathord}{lettersA}{02}
+ \re at DeclareMathSymbol{\varLambda}{\mathord}{lettersA}{03}
+ \re at DeclareMathSymbol{\varXi}{\mathord}{lettersA}{04}
+ \re at DeclareMathSymbol{\varPi}{\mathord}{lettersA}{05}
+ \re at DeclareMathSymbol{\varSigma}{\mathord}{lettersA}{06}
+ \re at DeclareMathSymbol{\varUpsilon}{\mathord}{lettersA}{07}
+ \re at DeclareMathSymbol{\varPhi}{\mathord}{lettersA}{08}
+ \re at DeclareMathSymbol{\varPsi}{\mathord}{lettersA}{09}
+ \re at DeclareMathSymbol{\varOmega}{\mathord}{lettersA}{10}
+
+\else
+
+ \re at DeclareMathSymbol{\Gamma}{\mathalpha}{lettersA}{00}
+ \re at DeclareMathSymbol{\Delta}{\mathalpha}{lettersA}{01}
+ \re at DeclareMathSymbol{\Theta}{\mathalpha}{lettersA}{02}
+ \re at DeclareMathSymbol{\Lambda}{\mathalpha}{lettersA}{03}
+ \re at DeclareMathSymbol{\Xi}{\mathalpha}{lettersA}{04}
+ \re at DeclareMathSymbol{\Pi}{\mathalpha}{lettersA}{05}
+ \re at DeclareMathSymbol{\Sigma}{\mathalpha}{lettersA}{06}
+ \re at DeclareMathSymbol{\Upsilon}{\mathalpha}{lettersA}{07}
+ \re at DeclareMathSymbol{\Phi}{\mathalpha}{lettersA}{08}
+ \re at DeclareMathSymbol{\Psi}{\mathalpha}{lettersA}{09}
+ \re at DeclareMathSymbol{\Omega}{\mathalpha}{lettersA}{10}
+
+ \re at DeclareMathSymbol{\otherGamma}{\mathord}{letters}{0}
+ \re at DeclareMathSymbol{\otherDelta}{\mathord}{letters}{1}
+ \re at DeclareMathSymbol{\otherTheta}{\mathord}{letters}{2}
+ \re at DeclareMathSymbol{\otherLambda}{\mathord}{letters}{3}
+ \re at DeclareMathSymbol{\otherXi}{\mathord}{letters}{4}
+ \re at DeclareMathSymbol{\otherPi}{\mathord}{letters}{5}
+ \re at DeclareMathSymbol{\otherSigma}{\mathord}{letters}{6}
+ \re at DeclareMathSymbol{\otherUpsilon}{\mathord}{letters}{7}
+ \re at DeclareMathSymbol{\otherPhi}{\mathord}{letters}{8}
+ \re at DeclareMathSymbol{\otherPsi}{\mathord}{letters}{9}
+ \re at DeclareMathSymbol{\otherOmega}{\mathord}{letters}{10}
+
+ \re at DeclareMathSymbol{\varGamma}{\mathord}{letters}{0}
+ \re at DeclareMathSymbol{\varDelta}{\mathord}{letters}{1}
+ \re at DeclareMathSymbol{\varTheta}{\mathord}{letters}{2}
+ \re at DeclareMathSymbol{\varLambda}{\mathord}{letters}{3}
+ \re at DeclareMathSymbol{\varXi}{\mathord}{letters}{4}
+ \re at DeclareMathSymbol{\varPi}{\mathord}{letters}{5}
+ \re at DeclareMathSymbol{\varSigma}{\mathord}{letters}{6}
+ \re at DeclareMathSymbol{\varUpsilon}{\mathord}{letters}{7}
+ \re at DeclareMathSymbol{\varPhi}{\mathord}{letters}{8}
+ \re at DeclareMathSymbol{\varPsi}{\mathord}{letters}{9}
+ \re at 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 at ilimits}
+\renewcommand{\oint}{\ointop\kp at ilimits}
+
+\re at DeclareMathSymbol{\coprodop}{\mathop}{largesymbols}{96}
+ \def\coprod{\coprodop\kp at slimits}
+\re at DeclareMathSymbol{\bigveeop}{\mathop}{largesymbols}{87}
+ \def\bigvee{\bigveeop\kp at slimits}
+\re at DeclareMathSymbol{\bigwedgeop}{\mathop}{largesymbols}{86}
+ \def\bigwedge{\bigwedgeop\kp at slimits}
+\re at DeclareMathSymbol{\biguplusop}{\mathop}{largesymbols}{85}
+ \def\biguplus{\biguplusop\kp at slimits}
+\re at DeclareMathSymbol{\bigcapop}{\mathop}{largesymbols}{84}
+ \def\bigcap{\bigcapop\kp at slimits}
+\re at DeclareMathSymbol{\bigcupop}{\mathop}{largesymbols}{83}
+ \def\bigcup{\bigcupop\kp at slimits}
+\re at DeclareMathSymbol{\prodop}{\mathop}{largesymbols}{81}
+ \def\prod{\prodop\kp at slimits}
+\re at DeclareMathSymbol{\sumop}{\mathop}{largesymbols}{80}
+ \def\sum{\sumop\kp at slimits}
+\re at DeclareMathSymbol{\bigotimesop}{\mathop}{largesymbols}{78}
+ \def\bigotimes{\bigotimesop\kp at slimits}
+\re at DeclareMathSymbol{\bigoplusop}{\mathop}{largesymbols}{76}
+ \def\bigoplus{\bigoplusop\kp at slimits}
+\re at DeclareMathSymbol{\bigodotop}{\mathop}{largesymbols}{74}
+ \def\bigodot{\bigodotop\kp at slimits}
+\re at DeclareMathSymbol{\bigsqcupop}{\mathop}{largesymbols}{70}
+ \def\bigsqcup{\bigsqcupop\kp at slimits}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Math Extension A (jkpexa) Definition % largesymbolsA
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\re at DeclareMathSymbol{\bignplusop}{\mathop}{largesymbolsA}{0}
+ \def\bignplus{\bignplusop\kp at slimits}
+\re at DeclareMathSymbol{\bigsqcupplusop}{\mathop}{largesymbolsA}{2}
+ \def\bigsqcupplus{\bigsqcupplusop\kp at slimits}
+\re at DeclareMathSymbol{\bigsqcapplusop}{\mathop}{largesymbolsA}{4}
+ \def\bigsqcapplus{\bigsqcapplusop\kp at slimits}
+\re at DeclareMathSymbol{\bigsqcapop}{\mathop}{largesymbolsA}{6}
+ \def\bigsqcap{\bigsqcapop\kp at slimits}
+
+\def\narrowiints{\ifkp at narrowiints10\else0\fi}
+
+\re at DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsA}{\narrowiints8}
+ \def\oiint{\oiintop\kp at ilimits}
+
+\def\narrowiints{\ifkp at narrowiints1\else0\fi}
+
+\re at DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsA}{10}
+ \def\ointctrclockwise{\ointctrclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsA}{12}
+ \def\ointclockwise{\ointclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsA}{14}
+ \def\sqint{\sqintop\kp at ilimits}
+\re at DeclareMathSymbol{\varprod}{\mathop}{largesymbolsA}{16}
+%\re at DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18}
+%\re at DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19}
+\re at DeclareMathSymbol{\br at cext}{\mathord}{largesymbolsA}{32}
+\re at DeclareMathSymbol{\iintop}{\mathop}{largesymbolsA}{\narrowiints33}
+ \def\iint{\iintop\kp at ilimits}
+\re at DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsA}{\narrowiints35}
+ \def\iiint{\iiintop\kp at ilimits}
+\re at DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsA}{\narrowiints37}
+ \def\iiiint{\iiiintop\kp at ilimits}
+\re at DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsA}{\narrowiints39}
+ \def\idotsint{\idotsintop\kp at ilimits}
+\re at DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsA}{\narrowiints41}
+ \def\oiiint{\oiiintop\kp at ilimits}
+\re at DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsA}{43}
+ \def\varointctrclockwise{\varointctrclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsA}{45}
+ \def\varointclockwise{\varointclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\fintop}{\mathop}{largesymbolsA}{62}
+ \def\fint{\fintop\kp at ilimits}
+\re at DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints64}
+ \def\oiintctrclockwise{\oiintctrclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints66}
+ \def\varoiintclockwise{\varoiintclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints68}
+ \def\oiiintctrclockwise{\oiiintctrclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints70}
+ \def\varoiiintclockwise{\varoiiintclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints72}
+ \def\oiintclockwise{\oiintclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints74}
+ \def\varoiintctrclockwise{\varoiintctrclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints76}
+ \def\oiiintclockwise{\oiiintclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints78}
+ \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\kp at ilimits}
+\re at DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsA}{\narrowiints80}
+ \def\sqiint{\sqiintop\kp at ilimits}
+\re at DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsA}{\narrowiints82}
+ \def\sqiiint{\sqiiintop\kp at ilimits}
+\re at DeclareMathSymbol{\varintop}{\mathop}{largesymbolsA}{84}
+ \def\varint{\varintop\kp at ilimits}
+\re at DeclareMathSymbol{\variintop}{\mathop}{largesymbolsA}{\narrowiints86}
+ \def\variint{\variintop\kp at ilimits}
+\re at DeclareMathSymbol{\variiintop}{\mathop}{largesymbolsA}{\narrowiints88}
+ \def\variiint{\variiintop\kp at ilimits}
+\re at DeclareMathSymbol{\variiiintop}{\mathop}{largesymbolsA}{\narrowiints90}
+ \def\variiiint{\variiiintop\kp at ilimits}
+\re at DeclareMathSymbol{\varidotsintop}{\mathop}{largesymbolsA}{\narrowiints92}
+ \def\varidotsint{\varidotsintop\kp at 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 at th.$}\hbox{$\m at th.$}\hbox{$\m at th.$}}}
+\def\ddots{\mathinner{\mkern1mu\raise7\p@
+ \vbox{\kern7\p@\hbox{$\m at th.$}}\mkern2mu
+ \raise4\p@\hbox{$\m at th.$}\mkern2mu\raise\p@\hbox{$\m at th.$}\mkern1mu}}
+
+
+%%% For \underbrace and \overbrace:
+%%% use brace extenstion bar (in "20 of jkpexa) instead of vrule (Acroread Bug...)
+\re at DeclareMathSymbol{\br at cext}{\mathord}{largesymbolsA}{32}
+\def\downbracefill{$\m at th%
+ \braceld\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br at cext\mkern-.5mu$}\hfill\mkern-1mu%
+ \braceru\bracelu%
+ \mkern-1mu\cleaders\hbox{$\mkern-.5mu\br at cext\mkern-.5mu$}\hfill\mkern-1mu\bracerd$}
+\def\upbracefill{$\m at th%
+ \bracelu\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br at cext\mkern-.5mu$}\hfill\mkern-1mu%
+ \bracerd\braceld%
+ \mkern-1mu\cleaders\hbox{$\mkern-.5mu\br at 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 at tch@r}{\mathrel}{symbols}{54}
+
+\DeclareRobustCommand*{\not}[1]{%
+ \ifx #1=\ne\else
+ \ifx #1<\nless\else
+ \ifx #1>\ngtr\else
+ \n at t@@n{#1}\fi\fi\fi}
+
+\def\n at t@@n#1{%
+ \begingroup \escapechar\m at ne\xdef\@gtempa{not\string#1}\endgroup%
+ \expandafter\@ifundefined{\@gtempa}%
+ {\not at n@{#1}}%
+ {\@nameuse{\@gtempa}}}
+\def\not at n@#1{%
+ \begingroup \escapechar\m at ne\xdef\@gtempa{n\string#1}\endgroup%
+ \expandafter\@ifundefined{\@gtempa}%
+ {\n at tch@r #1}%
+ {\@nameuse{\@gtempa}}}
+
+%%%%%%%%%%%%%%%%%%%
+% \D close integral
+%%%%%%%%%%%%%%%%%%%
+
+\ifkp at Dcommand
+ \DeclareMathSymbol{\kp at D}{\mathord}{operators}{100}
+ \def\D#1{\mathclose{\,\ifkp at upRm\kp at D%
+ \else\mathit{d}%
+ \fi}#1}
+\fi
+
+%%%%%%%%%%%%
+% new arrows
+%%%%%%%%%%%%
+
+\let\kp at ora\overrightarrow
+\def\overrightarrow#1{\,\kp at ora{#1\:}}
+
+\let\kp at ura\underrightarrow
+\def\underrightarrow#1{\,\kp at ura{#1\,}}
+
+\let\kp at ola\overleftarrow
+\def\overleftarrow#1{\kp at ola{\:#1}\,}
+
+\let\kp at ula\underleftarrow
+\def\underleftarrow#1{\kp at ula{\,#1}\,}
+
+%%%
+\fi %%% End of no-math option
+%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \classicstylenums and \olstylenums
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\classicstylenums#1{{\fontfamily{jkp\kp at stylemath\kp at famillem}\selectfont #1}}
+
+%%%
+
+\let\kp at osn\oldstylenums
+
+\ifkp at os
+ \ifkp at osm % fulloldstyle
+ \def\oldstylenums#1{#1}
+ \else
+ \ifkp at vosm % oldstyle and veryoldstylemath
+ \def\oldstylenums#1{#1}
+ \else % oldstyle
+ \def\oldstylenums#1{%
+ \relax\ifmmode\kp at osn{#1}%
+ \else#1\fi}
+ \fi
+ \fi
+\else
+ \ifkp at vos
+ \ifkp at vosm % fullveryoldstyle
+ \def\oldstylenums#1{#1}
+ \else
+ \ifkp at osm % veryoldstyle and oldstylemath
+ \def\oldstylenums#1{#1}
+ \else % veryoldstyle
+ \def\oldstylenums#1{%
+ \relax\ifmmode\kp at osn{#1}%
+ \else#1\fi}
+ \fi
+ \fi
+ \else
+ \ifkp at osm % oldstylemath
+ \def\oldstylenums#1{%
+ \relax\ifmmode#1%
+ \else\kp at osn{#1}\fi}
+ \else
+ \ifkp at vosm % veryoldstylemath
+ \def\oldstylenums#1{%
+ \relax\ifmmode#1%
+ \else\kp at osn{#1}\fi}
+ \fi
+ \fi
+ \fi
+\fi
+
+\endinput
Property changes on: trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc 2018-04-09 21:18:46 UTC (rev 47411)
@@ -1,7 +1,7 @@
$pdf_mode = 1;
$bibtex_use = 1;
-$bibtex = 'biber %O %B';
+$bibtex = 'biber -U %O %B';
$makeindex = 'texindy -L french';
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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 @@
\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,26 +211,68 @@
\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.
+\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}
+
+\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}
-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{bodycode}
\title[Le Traité du calcul des probabilités]{Le Traité du calcul des
probabilités et de ses applications}
@@ -269,6 +312,9 @@
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 @@
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 @@
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 @@
\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 @@
\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 @@
\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 @@
\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 @@
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 @@
\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 @@
\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,53 +1362,53 @@
% à \refCom{vref}.
% \end{dbremark}
-\subsection{\enquote{Équations} (non-)numérotées}
-\label{sec:equat-non-numer}
+% \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}
-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 @@
\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 @@
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 @@
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 @@
\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
Modified: trunk/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/source/latex/nwejm/nwejm-examples-template.dtx 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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}
Modified: trunk/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/nwejm/nwejm.dtx 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/source/latex/nwejm/nwejm.dtx 2018-04-09 21:18:46 UTC (rev 47411)
@@ -13,7 +13,7 @@
Release
-------
-Release 2017/02/14 v0.98d
+2018/04/07 v0.98e
Development
-----------
@@ -44,7 +44,7 @@
\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 @@
\endpreamble
\postamble
-Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
+Copyright (C) 2015-2018 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -174,6 +174,8 @@
%
%\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 @@
\ProvidesExplClass
%<class> {nwejm}
%<class-article> {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 @@
\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 @@
%
% \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 @@
% \end{macrocode}
%
% \begin{macrocode}
+\bool_new:N \g_@@_nolocaltoc_bool
+% \end{macrocode}
+%
+% \begin{macrocode}
%</class-article>
% \end{macrocode}
%
@@ -457,6 +464,9 @@
12pt .code:n = {%
\PassOptionsToClass{12pt}{book}
},%
+ draft .code:n = {%
+ \PassOptionsToClass{draft}{book}
+ },%
% \end{macrocode}
%
% \begin{macrocode}
@@ -519,8 +529,8 @@
% \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,105 +623,156 @@
\RequirePackage{graphicx}%
% \end{macrocode}
%
-% \item Establish input relative to a directory:
+% \item Graphics package-alike macros for \enquote{general} boxes:
% \begin{macrocode}
-%<class>\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}
-%<class>\bool_if:nT { \g_@@_for_authors_bool } {
-%<class> \RequirePackage{draftwatermark}[2006/06/30]%
-%<class>}
+\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}
-%<class>\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}
-%<class>\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}
+%</class|class-article>
+% \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}
-%<class>\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}
-%<class> \RequirePackage{tcolorbox}
+ \RequirePackage{tcolorbox}
% \end{macrocode}
%
% \item A single TikZ node for the whole page (used for cover crop marks)
% \begin{macrocode}
-%<class> \RequirePackage{tikzpagenodes}
-%<class> \ExplSyntaxOff
-%<class> \usetikzlibrary{calc,backgrounds}
-%<class> \ExplSyntaxOn
-%<class> \tcbuselibrary{skins}
-%<class> \tcbset{_@@_title_cover/.style={%
-%<class> colback=white,
-%<class> colframe=blue!37!white,
-%<class> colupper=blue,
-%<class> width=14cm,
-%<class> fontupper=\fontsize{9mm}{9mm}\fontseries{bx}\selectfont\sffamily,
-%<class> halign=center,
-%<class> valign=center,
-%<class> % boxsep=3mm,
-%<class> boxrule=3mm,
-%<class> left=\c_zero_dim,
-%<class> right=\c_zero_dim,
-%<class> sharp~corners,
-%<class> rounded~corners=northwest,
-%<class> % draft
-%<class> }
-%<class> }
+ \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}
-%<class> \RequirePackage{tkz-berge}
-%<class>}{
+ \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}
-%<class>\RequirePackage[group=false,subpreambles,sort]{standalone}%
-%<class>}
+\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}
+%</class>
+% \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:
% \begin{macrocode}
\RequirePackage{xspace}%
@@ -743,12 +804,12 @@
%
% \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 @@
%
% Load of main font to be used:
% \begin{macrocode}
-%<class>\RequirePackage[easyscsl,noDcommand]{kpfonts}
-%<class-article>\RequirePackage[noDcommand]{kpfonts}
+\RequirePackage[easyscsl,noDcommand]{kpfonts}
+% %<class-article>\RequirePackage[noDcommand]{kpfonts}
% \end{macrocode}
%
% \item Flexible and easy interface to page dimensions:
@@ -787,6 +848,11 @@
\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 @@
%
% \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 @@
\RequirePackage{environ}
% \end{macrocode}
%
-% \item Print page grid in background:
-% \begin{macrocode}
-%<class>\RequirePackage[foreground]{pagegrid}%
-% \end{macrocode}
-%
-% \item Tools to load and manipulate data:
-% \begin{macrocode}
-%<class>\RequirePackage{datatool}%
-% \end{macrocode}
-%
-% \item Control float placement:
-% \begin{macrocode}
-%<class>\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 @@
%
% \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 @@
\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 at etex.sty\endcsname{3000/12/31}
+\let\globcount\newcount
% \end{macrocode}
%
% \end{enumerate}
@@ -1087,7 +1141,7 @@
% \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 @@
\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 @@
\dim_const:Nn \c_@@_printer_layoutoffset_dim { 10mm }
% \end{macrocode}
%
+% \begin{macrocode}
+%</class|class-article>
+% \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 @@
}
% \end{macrocode}
%
-% \begin{macrocode}
-%</class|class-article>
-% \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 @@
}
% \end{macrocode}
%
-% \begin{macrocode}
-%</class>
-% \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,6 +1382,14 @@
}
% \end{macrocode}
%
+% \begin{macrocode}
+%</class>
+% \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).
@@ -1336,8 +1396,8 @@
% \begin{macrocode}
\dim_const:Nn \c_@@_paperheight_dim {
\c_@@_layoutheight_dim
- +
- 2\c_@@_potential_layoutoffset_dim
+%<class> +
+%<class> 2\c_@@_potential_layoutoffset_dim
}
% \end{macrocode}
%
@@ -1353,23 +1413,23 @@
% \end{description}
% \end{itemize}
% \begin{macrocode}
-\bool_if:NTF {\g_@@_cover_bool} {
+%<class>\bool_if:NTF {\g_@@_cover_bool} {
+%<class> \dim_const:Nn \c_@@_paperwidth_dim {
+%<class> \c_@@_layoutwidth_dim
+%<class> +
+%<class> \c_@@_potential_layoutoffset_dim
+%<class> +
+%<class> .5\c_@@_potential_bindingoffset_dim
+%<class> }
+%<class>}{
\dim_const:Nn \c_@@_paperwidth_dim {
\c_@@_layoutwidth_dim
- +
- \c_@@_potential_layoutoffset_dim
- +
- .5\c_@@_potential_bindingoffset_dim
+%<class> +
+%<class> 2\c_@@_potential_layoutoffset_dim
+%<class> +
+%<class> \c_@@_potential_bindingoffset_dim
}
-}{
- \dim_const:Nn \c_@@_paperwidth_dim {
- \c_@@_layoutwidth_dim
- +
- 2
- \c_@@_potential_layoutoffset_dim
- +\c_@@_potential_bindingoffset_dim
- }
-}
+%<class>}
% \end{macrocode}
%
% \begin{macrocode}
@@ -1441,19 +1501,19 @@
}
% \end{macrocode}
%
-% When the inside pages are produced, the crop marks are shown.
% \begin{macrocode}
-\bool_if:NT {\g_@@_inside_pages_bool} {
- \geometry{showcrop}
-}
+%</class|class-article>
% \end{macrocode}
%
% \begin{macrocode}
-%</class|class-article>
+%<*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 @@
% \begin{macrocode}
\tl_const:Nn \c_@@_main_geometry_tl {%
,layoutsize={\c_@@_layoutwidth_dim,\c_@@_layoutheight_dim}
- ,layoutoffset=\c_@@_potential_layoutoffset_dim
+%<class> ,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 @@
%
% \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 @@
% \@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 @@
}
\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 @@
\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 @@
% }
\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 @@
\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 { ,~ } { ,~ } { ,~ } }
%<class-article> \tl_if_empty:nTF {#1} {%
%<class-article> \hypersetup{pdfkeywords={\g_@@_keywords_tl}}
%<class-article> }{
@@ -2982,6 +3047,14 @@
}
}
% \end{macrocode}
+% \begin{macrocode}
+%</class>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*class|class-article>
+% \end{macrocode}
+%
% \end{macro}
%
% \subsection{\Pkg{Varioref}}
@@ -2989,31 +3062,30 @@
% We have to save the extra definitions of the \Pkg{varioref} which currently is
% multilingual aware.
% \begin{macrocode}
-\addto\extrasfrench{%
+\vref at 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}}%
+ {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}}%
}
-\addto\extrasngerman{%
+\vref at 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 at addto\extrasdutch{%
\def\refpagename{pagina}%
\def\reftextfaceafter {op~de~\reftextvario{rechter~\refpagename}%
{\refpagename\ hiernaast}}%
@@ -3024,29 +3096,26 @@
\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 at 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}
-%</class>
+\def\reftextvario#1#2{#2}
% \end{macrocode}
%
-% \begin{macrocode}
-%<*class|class-article>
-% \end{macrocode}
-%
% \subsection{Article setup}
%
% Some of the document commands will be restricted to document body, as the
@@ -3086,6 +3155,64 @@
% \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 @@
\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 @@
%
% We reset setup possibly chosen in previous articles.
% \begin{macrocode}
-%<class> \bool_gset_false:N \g_@@_gradient_nabla_bool
-%<class> \bool_gset_false:N \g_@@_gradient_nabla_control_bool
-%<class> \bool_gset_false:N \g_@@_grad_used_bool
+%<class> \bool_gset_false:N \g_@@_gradient_nabla_bool
+%<class> \bool_gset_false:N \g_@@_gradient_nabla_control_bool
+%<class> \bool_gset_false:N \g_@@_grad_used_bool
% \end{macrocode}
%
% \begin{macrocode}
@@ -3201,7 +3333,7 @@
% 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,6 +3347,7 @@
% \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}
@@ -3221,10 +3354,17 @@
{
\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 @@
%
% 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}
-%<class> \FloatBarrier%
+%<class> \FloatBarrier%
% \end{macrocode}
%
% We store the unique bibliographic key of the current article in the
@@ -3685,6 +3825,17 @@
\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 @@
\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 @@
{
\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 @@
}
% \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 @@
%
% \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 @@
}
\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 @@
}
}
}
+\AfterEndPreamble{
+ \ifcurrentbaselanguage{french}{\g_@@_french_crefname_tl}{}
+}
% \end{macrocode}
%
% \subsection{Assertions and hypotheses enumerations}
@@ -4538,19 +4717,11 @@
#1
}
\NewDocumentCommand \set { m O{} } {
- \if at 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 @@
}
% \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 at 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
+ -
}
- % \msg_warning:nnn{nwejmart}{Starred~AMS~environments}{#1}
+ \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}
+ }
+% \end{macrocode}
+%
+% We set the label of the current line.
+% \begin{macrocode}
+ \ltx at 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 at double@backslash at add@space }{ \multiline at double@backslash at add@space }{ \multiline at double@backslash at add@double at 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 at 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 at double@backslash}{so}{%
+ \db_multiline_double_backslash:nn {#1}{#2}
+}
+\NewDocumentCommand{\multiline at double@backslash at add@space}{so}{%
+ \db_multiline_double_backslash:nn {#1}{#2}
+ \hspace{\mathindent}
+}
+\NewDocumentCommand{\multiline at double@backslash at add@double at 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 at 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 at marginnote}{%
+ \@dblarg\NWEJM at mn@marginnote
+}
+\newcommand{\NWEJM at mn@marginnote}[2][]{%
+ \ifhmode
+ \@bsphack
+ \begingroup
+ \ifdim\@savsk>\z@\else
+ \def\:{\@xifnch}\expandafter\def\: { \futurelet\@let at token\@ifnch}%
+ \fi
+ \else
+ \begingroup
+ \fi
+ \@ifnextchar [{\NWEJM at mn@@marginnote[{#1}]{#2}}{\NWEJM at mn@@marginnote[{#1}]{#2}[\z@]}%
+}
+\newcommand{\NWEJM at mn@@marginnote}{}
+\long\def\NWEJM at mn@@marginnote[#1]#2[#3]{%
+ \endgroup
+ \ifhmode
+ \NWEJM at mn@@@marginnote[{#1}]{#2}[{#3}]%
+ \@esphack
+ \else
+ \NWEJM at mn@@@marginnote[{#1}]{#2}[{#3}]%
+ \fi
+}
+
+\long\def\NWEJM at mn@@@marginnote[#1]#2[#3]{%
+ \begingroup
+ \ifmmode\mn at strut\let\@tempa\mn at vadjust\else
+ \if at inlabel\leavevmode\fi
+ \ifhmode\mn at strut\let\@tempa\mn at vadjust\else\let\@tempa\mn at vlap\fi
+ \fi
+ \@tempa{%
+ \vbox to\z@{%
+ \vss
+ \@mn at margintest
+ \if at reversemargin\if at tempswa
+ \@tempswafalse
+ \else
+ \@tempswatrue
+ \fi\fi
+ \rlap{%
+ \ifx\@mn at currxpos\relax
+ \kern\marginnoterightadjust
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos not known,\MessageBreak
+ using \string\marginnoterightadjust}%
+ \fi
+ \else\ifx\@mn at currxpos\@empty
+ \kern\marginnoterightadjust
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos not known,\MessageBreak
+ using \string\marginnoterightadjust}%
+ \fi
+ \else
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos seems to be \@mn at currxpos,\MessageBreak
+ \string\marginnoterightadjust
+ \space ignored}%
+ \fi
+ \begingroup
+ \setlength{\@tempdima}{\@mn at currxpos}%
+ \kern-\@tempdima
+ \if at twoside\ifodd\@mn at 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,7 +5312,7 @@
%
% \begin{macro}{\printbibliography}
% \begin{macrocode}
-\int_new:N \l_@@_section_int
+% \newcounter{lastpagearticle}
\cs_set_eq:NN \_@@_printbibliography \printbibliography
\RenewDocumentCommand \printbibliography { O{} } {
% \end{macrocode}
@@ -4775,7 +5319,7 @@
% We force all the previous floats to be processed no later on the page
% following the beginning of the bibliography.
% \begin{macrocode}
-%<class> \FloatBarrier%
+ \FloatBarrier%
% \end{macrocode}
% We automatically insert the acknowledgments (if any) before the bibliography.
% \begin{macrocode}
@@ -4801,6 +5345,7 @@
% 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 @@
% We don't want the article's title (chapter's title) in the (local) table of
% contents.
% \begin{macrocode}
+% %<class> \group_begin:
+% %<class> \hypersetup{bookmarksdepth=-2}
+% %<class> \etocsetnexttocdepth{subsection}
+% %<class> \etocsettocdepth.toc{chapter}
+% %<class> \tableofcontents\ref{\l_@@_localtableofcontents_label_tl}
+% %<class> \etocsettocdepth.toc {subsection}
+% %<class> \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,19 +5564,7 @@
\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 at saveEnvironmentSubcommands}
- {(0,0)\begin}
- {(0,0)\hfuzz=\maxdimen\begin}
- {}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
%</class|class-article>
% \end{macrocode}
%
@@ -5237,6 +5788,9 @@
\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 @@
\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 @@
\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 @@
\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 @@
\RequireCitationStyle{authoryear}
-\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict}
+\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict,pagetracker=page}
% \end{macrocode}
%
@@ -5652,8 +6215,7 @@
% ×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 @@
\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 @@
{\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 @@
$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 @@
#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
Deleted: trunk/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl 2018-04-09 21:18:46 UTC (rev 47411)
@@ -37,3 +37,4 @@
\ProvideDictTranslation{ie}{i.e}
\ProvideDictTranslation{Idest}{Id~est}
\ProvideDictTranslation{Ie}{I.e}
+\ProvideDictTranslation{equation-continues-next-page}{Cont. ~next ~page}
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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.}
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx 2018-04-09 21:18:46 UTC (rev 47411)
@@ -96,7 +96,7 @@
\renewcommand*\bibnamedelimc{\addnbspace}
\renewcommand*\bibnamedelimd{\addnbspace}
%%
-%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
+%% Copyright (C) 2015-2018 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx 2018-04-09 21:18:46 UTC (rev 47411)
@@ -17,7 +17,7 @@
\RequireCitationStyle{authoryear}
-\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict}
+\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict,pagetracker=page}
\renewrobustcmd{\blx at mkbibfootnote}[2]{%
\iftoggle{blx at 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 <denis.bitouze at univ-littoral.fr>
+%% Copyright (C) 2015-2018 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cls 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.cls 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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 at 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 at 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}}%
+ {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}}%
}
-\addto\extrasngerman{%
+\vref at 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 at 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 at 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,12 +1471,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
@@ -1472,9 +1536,9 @@
}{%
\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,10 +1579,11 @@
}%
}
\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}
@@ -1525,10 +1590,17 @@
{
\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 at 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,15 +2717,281 @@
left=<,
right=>
}
-\AfterEndPreamble{
- \autonum at 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 at 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 at double@backslash at add@space }{ \multiline at double@backslash at add@space }{ \multiline at double@backslash at add@double at 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 at 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 at double@backslash}{so}{%
+ \db_multiline_double_backslash:nn {#1}{#2}
+}
+\NewDocumentCommand{\multiline at double@backslash at add@space}{so}{%
+ \db_multiline_double_backslash:nn {#1}{#2}
+ \hspace{\mathindent}
+}
+\NewDocumentCommand{\multiline at double@backslash at add@double at 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 at 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 at marginnote}{%
+ \@dblarg\NWEJM at mn@marginnote
+}
+\newcommand{\NWEJM at mn@marginnote}[2][]{%
+ \ifhmode
+ \@bsphack
+ \begingroup
+ \ifdim\@savsk>\z@\else
+ \def\:{\@xifnch}\expandafter\def\: { \futurelet\@let at token\@ifnch}%
+ \fi
+ \else
+ \begingroup
+ \fi
+ \@ifnextchar [{\NWEJM at mn__nwejmmarginnote[{#1}]{#2}}{\NWEJM at mn__nwejmmarginnote[{#1}]{#2}[\z@]}%
+}
+\newcommand{\NWEJM at mn__nwejmmarginnote}{}
+\long\def\NWEJM at mn__nwejmmarginnote[#1]#2[#3]{%
+ \endgroup
+ \ifhmode
+ \NWEJM at mn__nwejm@marginnote[{#1}]{#2}[{#3}]%
+ \@esphack
+ \else
+ \NWEJM at mn__nwejm@marginnote[{#1}]{#2}[{#3}]%
+ \fi
+}
+
+\long\def\NWEJM at mn__nwejm@marginnote[#1]#2[#3]{%
+ \begingroup
+ \ifmmode\mn at strut\let\@tempa\mn at vadjust\else
+ \if at inlabel\leavevmode\fi
+ \ifhmode\mn at strut\let\@tempa\mn at vadjust\else\let\@tempa\mn at vlap\fi
+ \fi
+ \@tempa{%
+ \vbox to\z@{%
+ \vss
+ \@mn at margintest
+ \if at reversemargin\if at tempswa
+ \@tempswafalse
+ \else
+ \@tempswatrue
+ \fi\fi
+ \rlap{%
+ \ifx\@mn at currxpos\relax
+ \kern\marginnoterightadjust
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos not known,\MessageBreak
+ using \string\marginnoterightadjust}%
+ \fi
+ \else\ifx\@mn at currxpos\@empty
+ \kern\marginnoterightadjust
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos not known,\MessageBreak
+ using \string\marginnoterightadjust}%
+ \fi
+ \else
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos seems to be \@mn at currxpos,\MessageBreak
+ \string\marginnoterightadjust
+ \space ignored}%
+ \fi
+ \begingroup
+ \setlength{\@tempdima}{\@mn at currxpos}%
+ \kern-\@tempdima
+ \if at twoside\ifodd\@mn at 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}{%
\ifcurrentbaselanguage{french}{%
@@ -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 at saveEnvironmentSubcommands}
- {(0,0)\begin}
- {(0,0)\hfuzz=\maxdimen\begin}
- {}{}
%%
-%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
+%% Copyright (C) 2015-2018 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Added: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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 at 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 <denis.bitouze at univ-littoral.fr>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License (LPPL), either
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Denis Bitouze.
+%%
+%% This work consists of the file nwejm.dtx and a Makefile.
+%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
+%% Running "make inst" installs the files in the user's TeX tree.
+%% Running "make install" installs the files in the local TeX tree.
+%%
+%%
+%% End of file `nwejm.dbx'.
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx 2018-04-09 21:18:46 UTC (rev 47411)
@@ -21,7 +21,7 @@
volumes = {{volumes}{vol\adddot}},
}
%%
-%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
+%% Copyright (C) 2015-2018 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls 2018-04-09 21:18:22 UTC (rev 47410)
+++ trunk/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls 2018-04-09 21:18:46 UTC (rev 47411)
@@ -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,24 +152,30 @@
\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}
@@ -172,15 +182,16 @@
\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 at 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 at 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 at 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 at 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 at 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,10 +780,11 @@
}%
}
\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}
@@ -713,10 +791,17 @@
{
\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 at 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,15 +1919,281 @@
left=<,
right=>
}
-\AfterEndPreamble{
- \autonum at 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 at 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 at double@backslash at add@space }{ \multiline at double@backslash at add@space }{ \multiline at double@backslash at add@double at 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 at 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 at double@backslash}{so}{%
+ \db_multiline_double_backslash:nn {#1}{#2}
+}
+\NewDocumentCommand{\multiline at double@backslash at add@space}{so}{%
+ \db_multiline_double_backslash:nn {#1}{#2}
+ \hspace{\mathindent}
+}
+\NewDocumentCommand{\multiline at double@backslash at add@double at 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 at 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 at marginnote}{%
+ \@dblarg\NWEJM at mn@marginnote
+}
+\newcommand{\NWEJM at mn@marginnote}[2][]{%
+ \ifhmode
+ \@bsphack
+ \begingroup
+ \ifdim\@savsk>\z@\else
+ \def\:{\@xifnch}\expandafter\def\: { \futurelet\@let at token\@ifnch}%
+ \fi
+ \else
+ \begingroup
+ \fi
+ \@ifnextchar [{\NWEJM at mn__nwejmmarginnote[{#1}]{#2}}{\NWEJM at mn__nwejmmarginnote[{#1}]{#2}[\z@]}%
+}
+\newcommand{\NWEJM at mn__nwejmmarginnote}{}
+\long\def\NWEJM at mn__nwejmmarginnote[#1]#2[#3]{%
+ \endgroup
+ \ifhmode
+ \NWEJM at mn__nwejm@marginnote[{#1}]{#2}[{#3}]%
+ \@esphack
+ \else
+ \NWEJM at mn__nwejm@marginnote[{#1}]{#2}[{#3}]%
+ \fi
+}
+
+\long\def\NWEJM at mn__nwejm@marginnote[#1]#2[#3]{%
+ \begingroup
+ \ifmmode\mn at strut\let\@tempa\mn at vadjust\else
+ \if at inlabel\leavevmode\fi
+ \ifhmode\mn at strut\let\@tempa\mn at vadjust\else\let\@tempa\mn at vlap\fi
+ \fi
+ \@tempa{%
+ \vbox to\z@{%
+ \vss
+ \@mn at margintest
+ \if at reversemargin\if at tempswa
+ \@tempswafalse
+ \else
+ \@tempswatrue
+ \fi\fi
+ \rlap{%
+ \ifx\@mn at currxpos\relax
+ \kern\marginnoterightadjust
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos not known,\MessageBreak
+ using \string\marginnoterightadjust}%
+ \fi
+ \else\ifx\@mn at currxpos\@empty
+ \kern\marginnoterightadjust
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos not known,\MessageBreak
+ using \string\marginnoterightadjust}%
+ \fi
+ \else
+ \if at mn@verbose
+ \PackageInfo{marginnote}{%
+ xpos seems to be \@mn at currxpos,\MessageBreak
+ \string\marginnoterightadjust
+ \space ignored}%
+ \fi
+ \begingroup
+ \setlength{\@tempdima}{\@mn at currxpos}%
+ \kern-\@tempdima
+ \if at twoside\ifodd\@mn at 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}{%
\ifcurrentbaselanguage{french}{%
@@ -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 at saveEnvironmentSubcommands}
- {(0,0)\begin}
- {(0,0)\hfuzz=\maxdimen\begin}
- {}{}
%%
-%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
+%% Copyright (C) 2015-2018 by Denis Bitouze <denis.bitouze at univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
More information about the tex-live-commits
mailing list