diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/nwejm/nwejmart.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/nwejm/nwejmart.cls | 522 |
1 files changed, 441 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls index bce4a1fbd6e..be444ea3ccf 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls +++ b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls @@ -18,8 +18,8 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesExplClass {nwejmart} - {2017/02/14} - {0.98d} + {2018/04/07} + {0.98e} { Class for the journal "North-Western European Journal of Mathematics". } @@ -30,7 +30,7 @@ \msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{You~ are~ using~ the~ `nwejm'~ class~ designed~ for~ the~ complete~ issues~ of~ the~ NWEJM~ and~ aimed~ for~ the~ NWEJM's~ team,~ not~ for~ authors~ of~ articles:~ if~ you're~ - an~ author~ of~ an~ article~,~ you~ should~ use~ the~ `nwejmart'~ class~ + an~ author~ of~ an~ article,~ you~ should~ use~ the~ `nwejmart'~ class~ instead.~ Otherwise,~ if~ you're~ from~ the~ NWEJM's~ team,~ please~ note~ that~ the~ issue's~ main~ file~ should~ be~ named~ `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~ `\c_sys_jobname_str.tex'.~ @@ -91,6 +91,7 @@ \selectlanguage{#1} } } +\bool_new:N \g__nwejm_nolocaltoc_bool \keys_define:nn { nwejm } { 10pt .code:n = {% @@ -102,6 +103,9 @@ 12pt .code:n = {% \PassOptionsToClass{12pt}{book} },% + draft .code:n = {% + \PassOptionsToClass{draft}{book} + },% english .code:n = { \__nwejm_language:n {english} },% @@ -128,8 +132,8 @@ \ProcessKeysOptions { nwejm } \LoadClass { book } \PassOptionsToPackage{export}{adjustbox}% -\PassOptionsToPackage{fleqn}{mathtools}% -\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev}{cleveref} +\PassOptionsToPackage{fleqn}{amsmath}% +\PassOptionsToPackage{french,ngerman,dutch,english,noabbrev,capitalize}{cleveref} \bool_if:NF {\g__nwejm_language_specified_bool} { \__nwejm_language:n {english} } @@ -148,39 +152,46 @@ \RequirePackage{xr} \RequirePackage{currfile} \RequirePackage[multiple]{footmisc}% +\RequirePackage{marginnote}% +\RequirePackage{refcount}% \RequirePackage{xcolor}% +\RequirePackage{afterpage}% +\RequirePackage{ifoddpage}% +\RequirePackage{placeins}% \RequirePackage{xspace}% \RequirePackage[autostyle]{csquotes}% \RequirePackage{array} \RequirePackage{booktabs} \RequirePackage{mathtools} -\RequirePackage[thmmarks,amsmath]{ntheorem} -\RequirePackage{mathrsfs} +\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem} +\RequirePackage{rsfso} \RequirePackage{esvect} -\RequirePackage[noDcommand]{kpfonts} +\RequirePackage[easyscsl,noDcommand]{kpfonts} \RequirePackage{geometry} \RequirePackage{translations}% \RequirePackage{fmtcount}% \RequirePackage{babel}% \RequirePackage{varioref} +\RequirePackage{subcaption} \RequirePackage{tocvsec2} \RequirePackage{etoc}% -\RequirePackage[babel=true]{microtype}% +\RequirePackage[babel=true,final]{microtype}% \RequirePackage[useregional]{datetime2}% \RequirePackage[inline]{enumitem}% \RequirePackage{environ} \RequirePackage{footnote}% \RequirePackage[backend=biber,style=nwejm]{biblatex}% \ExecuteBibliographyOptions{defernumbers=true,dashed=false,uniquename=init,backref,safeinputenc} -\RequirePackage[hyperfootnotes=false,pdfencoding=unicode]{hyperref}% +\RequirePackage[hyperfootnotes=false,pdfencoding=unicode,final]{hyperref}% \AtBeginDocument{% - \hypersetup{hidelinks,hypertexnames=false}% + \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% \RequirePackage[all]{hypcap} \RequirePackage[numbered]{bookmark}% \RequirePackage[nowarn]{glossaries}% \RequirePackage{cleveref}% -\RequirePackage{autonum} +\expandafter\def\csname ver@etex.sty\endcsname{3000/12/31} +\let\globcount\newcount \makeglossaries \setglossarystyle{indexhypergroup} \setacronymstyle{long-sc-short} @@ -210,7 +221,7 @@ \ifcurrentbaselanguage{french}{\FBcolonspace}{}: % \ifundef{\Fcolonspace}{\FBcolonspace}{\Fcolonspace}: } -\tl_const:Nn \c__nwejm_aside_string_tl {--} +\tl_const:Nn \c__nwejm_aside_string_tl {---} \tl_const:Nn \c__nwejm_draftwatermark_string_tl {draft} \tl_const:Nn \c__nwejm_issue_bib_file_suffix_string_tl {__nwejm} \tl_const:Nn \c__nwejm_issue_bib_file_string_tl {\c_sys_jobname_str\c__nwejm_issue_bib_file_suffix_string_tl.bib} @@ -237,42 +248,12 @@ \dim_const:Nn \c__nwejm_layoutheight_dim { 240mm} \dim_const:Nn \c__nwejm_layoutwidth_dim { 170mm} \dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 10mm } -\bool_if:NTF {\g__nwejm_for_printer_bool} { - \dim_const:Nn \c__nwejm_potential_layoutoffset_dim { \c__nwejm_printer_layoutoffset_dim} -}{ - \dim_const:Nn \c__nwejm_potential_layoutoffset_dim {\c_zero_dim} -} -\bool_if:NTF {\g__nwejm_cover_bool} { - \dim_compare:nTF {\g__nwejm_binding_dim > \c_zero_dim} {% - \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \g__nwejm_binding_dim } - }{ - \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim } - } -}{ - \dim_const:Nn \c__nwejm_potential_bindingoffset_dim {\c_zero_dim} -} \dim_const:Nn \c__nwejm_paperheight_dim { \c__nwejm_layoutheight_dim - + - 2\c__nwejm_potential_layoutoffset_dim } -\bool_if:NTF {\g__nwejm_cover_bool} { \dim_const:Nn \c__nwejm_paperwidth_dim { \c__nwejm_layoutwidth_dim - + - \c__nwejm_potential_layoutoffset_dim - + - .5\c__nwejm_potential_bindingoffset_dim } -}{ - \dim_const:Nn \c__nwejm_paperwidth_dim { - \c__nwejm_layoutwidth_dim - + - 2 - \c__nwejm_potential_layoutoffset_dim - +\c__nwejm_potential_bindingoffset_dim - } -} \dim_const:Nn \c__nwejm_topmargin_dim { 20mm} \dim_const:Nn \c__nwejm_topmargin_frontcover_dim { \c__nwejm_topmargin_dim @@ -318,12 +299,8 @@ \geometry{% papersize={\c__nwejm_paperwidth_dim,\c__nwejm_paperheight_dim} } -\bool_if:NT {\g__nwejm_inside_pages_bool} { - \geometry{showcrop} -} \tl_const:Nn \c__nwejm_main_geometry_tl {% ,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim} - ,layoutoffset=\c__nwejm_potential_layoutoffset_dim ,textwidth=\c__nwejm_layoutwidth_dim*3/4 ,textheight=\c__nwejm_layoutheight_dim*3/4 % ,marginratio={4\string :6,5\string :7} @@ -353,10 +330,10 @@ \newpagestyle{__nwejm_mainmatter_ps}[]{% \sethead% [ - \tl_if_exist:NT {\g__nwejm_short_title_tl} + \tl_if_exist:NT {\g__nwejm_header_title_tl} { - \tl_if_empty:NF \g__nwejm_short_title_tl {% - \slshape\g__nwejm_short_title_tl + \tl_if_empty:NF \g__nwejm_header_title_tl {% + \slshape\g__nwejm_header_title_tl } } ]% @@ -615,7 +592,7 @@ \tl_gclear:N \g__nwejm_keywords_tl \tl_clear:N \l_tmpb_clist \clist_set:Nn \l_tmpb_clist {#2} - \tl_set:Nn \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } + \tl_set:Nx \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } } \tl_if_empty:nTF {#1} {% \hypersetup{pdfkeywords={\g__nwejm_keywords_tl}} }{ @@ -636,6 +613,53 @@ {\externaldocument[__nwejm-]{\c__nwejm_main_file_name_tl} \AtBeginDocument{\setcounter{page}{\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}} } +\vref@addto\extrasfrench{% + \def\reftextfaceafter {page~\reftextvario{ci-contre}{suivante}}% + \def\reftextfacebefore{page~\reftextvario{ci-contre}% + {pr\'ec\'edente}}% + \def\reftextafter + {page~suivante}% + \def\reftextbefore + {page~pr\'ec\'edente}% + \def\reftextcurrent {de~la~pr\'esente~page}% + \def\reftextfaraway#1{p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{p.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~\‘a\nobreakspace\ref{#2}}% +} +\vref@addto\extrasngerman{% + \def\reftextfaceafter {auf~der~n\"achsten~Seite}% + \def\reftextfacebefore{auf~der~vorherigen~Seite}% + \let\reftextafter \reftextfaceafter + \let\reftextbefore \reftextfacebefore + \def\reftextcurrent {auf~dieser~Seite}% + \def\reftextfaraway#1{auf~S.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{auf~den~S.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~bis\nobreakspace\ref{#2}}% +} +\vref@addto\extrasdutch{% + \def\refpagename{pagina}% + \def\reftextfaceafter {op~de~\reftextvario{rechter~\refpagename}% + {\refpagename\ hiernaast}}% + \def\reftextfacebefore{op~de~\reftextvario{linker~\refpagename}% + {\refpagename\ hiernaast}}% + \def\reftextafter {op~de~\reftextvario{volgende~\refpagename}% + {\refpagename\ hierna}}% + \def\reftextbefore {op~de~\reftextvario{vorige~\refpagename}% + {\refpagename\ hiervoor}}% + \def\reftextcurrent {op~deze~\refpagename}% + \def\reftextfaraway#1{op~\refpagename\nobreakspace\pageref{#1}} +} +\vref@addto\extrasenglish{% + \def\reftextfaceafter {on~the~\reftextvario{facing}{next}~page}% + \def\reftextfacebefore{on~the~\reftextvario{facing}{preceding}~page}% + \def\reftextafter {on~the~\reftextvario{following}{next}~page}% + \def\reftextbefore {on~the~\reftextvario{preceding}{previous}~page}% + \def\reftextcurrent {on~\reftextvario{this}{the~current}~page}% + \def\reftextfaraway#1{on~p.\nobreakspace\pageref{#1}}% + \def\reftextpagerange#1#2{on~pp.\nobreakspace\pageref{#1}--\pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1}~to\nobreakspace\ref{#2}}% +} +\def\reftextvario#1#2{#2} \cs_new_protected:Nn \__nwejm_command_only_in_body:n { \cs_if_eq:NNF {\@onlypreamble} {\@notprerr} { @@ -651,12 +675,65 @@ \NewDocumentCommand \dates { m } { \keys_set:nn { nwejm/dates } { #1 } } +\tl_gset:Nn \g__nwejm_french_crefname_tl { + \clist_set:Nn \l_tmpa_clist {% + theorem, + corollary, + conjecture, + proposition, + lemma, + axiom, + definition, + remark, + example, + notation, + proof% + } + \clist_map_inline:Nn \l_tmpa_clist { + \crefname{#1}{ + \tl_lower_case:n{ + \GetTranslationFor{french}{#1} + } + }{% + \tl_lower_case:n{ + \GetTranslationFor{french}{plural-#1} + } + } + } + \crefname{equation}{{\'e}quation}{{\'e}quations}% + \crefname{figure}{figure}{figures}% + \crefname{table}{table}{tables}% + \crefname{page}{page}{pages}% + \crefname{part}{partie}{parties}% + \crefname{chapter}{chapitre}{chapitres}% + \crefname{section}{section}{sections}% + \crefname{appendix}{annexe}{annexes}% + \crefname{enumi}{point}{points}% + \crefname{footnote}{note}{notes}% + \crefname{theorem}{th\'eor\`eme}{th\'eor\`emes}% + \crefname{lemma}{lemme}{lemmes}% + \crefname{corollary}{corollaire}{corollaires}% + \crefname{proposition}{proposition}{propositions}% + \crefname{definition}{d\'efinition}{d\'efinitions}% + \crefname{result}{r\'esultat}{r\'esultats}% + \crefname{example}{exemple}{exemples}% + \crefname{remark}{remarque}{remarques}% + \crefname{note}{commentaire}{commentaires}% + \crefname{algorithm}{algorithme}{algorithmes}% + \crefname{listing}{liste}{listes}% + \crefname{line}{ligne}{lignes}% +} \NewDocumentCommand \inputarticle { O{english} m } {% \newrefsection \tl_if_eq:nnTF { #1 } { german } {% \selectlanguage{ngerman} }{ - \selectlanguage{#1} + \tl_if_eq:nnTF { #1 } { french } {% + \selectlanguage{french} + \g__nwejm_french_crefname_tl + }{ + \selectlanguage{#1} + } }% \tl_if_eq:nnTF { #1 } { french } {% \FrenchFootnotes @@ -703,20 +780,28 @@ }% } \tl_new:N \g__nwejm_title_tl -\RenewDocumentCommand \title { o m } { +\RenewDocumentCommand \title { o o m } { \cleardoublepage \int_gincr:N \g__nwejm_articles_int \tl_gclear:N \g__nwejm_short_title_tl + \tl_gclear:N \g__nwejm_header_title_tl \tl_gclear:N \g__nwejm_short_subtitle_tl % \IfNoValueF {#1} { \tl_gset:Nn \g__nwejm_short_title_tl {#1} } - \tl_gset:Nn \g__nwejm_title_tl {#2} + \IfNoValueF {#2} + { + \tl_gset:Nn \g__nwejm_header_title_tl {#2} + } + \tl_gset:Nn \g__nwejm_title_tl {#3} \tl_if_empty:NT \g__nwejm_short_title_tl {% \tl_gset_eq:NN \g__nwejm_short_title_tl \g__nwejm_title_tl } + \tl_if_empty:NT \g__nwejm_header_title_tl {% + \tl_gset_eq:NN \g__nwejm_header_title_tl \g__nwejm_short_title_tl + } } \tl_new:N \g__nwejm_subtitle_tl \NewDocumentCommand \subtitle { o m } { @@ -1061,7 +1146,8 @@ \cs_set_eq:NN \__nwejm_subsection \subsection \cs_set_eq:NN \__nwejm_subsubsection \subsubsection \AfterPreamble{% - \RenewDocumentCommand \section { s o m } {% + \RenewDocumentCommand \section { s o o m } {% + \tl_gclear:N \g__nwejm_short_section_title_tl \IfBooleanTF {#1} { \setsecnumdepth{none}% @@ -1069,7 +1155,16 @@ { \resetsecnumdepth*% } - \IfNoValueTF{#2}{\__nwejm_section{#3}}{\__nwejm_section[#2]{#3}} + \tl_gset:Nn \g__nwejm_section_title_tl {#4} + \IfNoValueTF{#2}{ + \tl_gset:Nn \g__nwejm_short_section_title_tl {#4} + }{ + \tl_gset:Nn \g__nwejm_short_section_title_tl {#2} + } + \__nwejm_section[\g__nwejm_short_section_title_tl]{\g__nwejm_section_title_tl} + \IfNoValueF {#3}{ + \sectionmark{#3} + } } \RenewDocumentCommand \subsection { s o m } {% \IfBooleanT {#1} @@ -1143,6 +1238,10 @@ }{ } } +\DeclareCaptionLabelSeparator{dash}{\nobreakspace--\nobreakspace} +\captionsetup{ + labelsep=dash + } \NewDocumentCommand \century { s m } {% \__nwejm_ordinalnum_suffix:n {#2}% \IfBooleanTF {#1} @@ -1392,12 +1491,16 @@ } \clist_map_inline:Nn \l_tmpa_clist { \crefname{#1}{ - \GetTranslation{#1} - }{% - \GetTranslation{plural-#1} + \tl_mixed_case:n{ + \GetTranslation{#1} + } + }{ + \tl_mixed_case:n{ + \GetTranslation{plural-#1} + } } \Crefname{#1}{ - \tl_mixed_case:n{ \protect + \tl_mixed_case:n{ \GetTranslation{#1} } }{% @@ -1406,6 +1509,9 @@ } } } +\AfterEndPreamble{ + \ifcurrentbaselanguage{french}{\g__nwejm_french_crefname_tl}{} +} \clist_set:Nn \l_tmpa_clist {% hypothesis, assertion% @@ -1686,19 +1792,11 @@ #1 } \NewDocumentCommand \set { m O{} } { - \if@display \tl_if_empty:nTF {#2} {% \__nwejm_set*{#1} }{ \__nwejm_set*{#1\l__nwejm_given_tl #2} } - \else - \tl_if_empty:nTF {#2} {% - \__nwejm_set{#1} - }{ - \__nwejm_set{#1\l__nwejm_given_tl #2} - } - \fi } \DeclareDocumentCommand{\NewPairedDelimiter}{mm} { @@ -1821,14 +1919,280 @@ left=<, right=> } -\AfterEndPreamble{ - \autonum@generatePatchedReferenceCSL{vref} - \clist_set:Nn \l_tmpa_clist {equation,align,gather,multline,flalign} - \clist_map_inline:Nn \l_tmpa_clist { - \cs_set_eq:cc {#1*} {#1} - \cs_set_eq:cc {end#1*} {end#1} +\AtEndPreamble{\allowdisplaybreaks} +\int_new:N \g_multiline_eq_int +\int_new:N \g_line_of_multiline_eq_int +\tl_new:N \g_line_of_multiline_eq_label_tl +\tl_new:N \g_next_line_of_multiline_eq_label_tl +\clist_set:Nn \l_tmpa_clist {align,multline} +\clist_map_inline:Nn \l_tmpa_clist { + \cs_set_eq:cc {db_#1_start:} {#1} + \cs_set_eq:cc {db_#1_end:} {end#1} + \cs_set_eq:cc {db_#1_star_start:} {#1*} + \NewDocumentEnvironment{amsmath#1}{} + {\cs:w db_#1_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} + \NewDocumentEnvironment{amsmath#1*}{} + {\cs:w db_#1_star_start:\cs_end:} + {\cs:w db_#1_end:\cs_end:} + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {#1} \BODY } - % \msg_warning:nnn{nwejmart}{Starred~AMS~environments}{#1} + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {#1*} \BODY + } +} +\bool_new:N \g__nwejm_within_patched_amsmath_env_bool +\clist_set:Nn \l_tmpa_clist {flalign,alignat} +\clist_map_inline:Nn \l_tmpa_clist { + \RenewEnviron{#1} + { + \cs:w db_multiline_eq:nV\cs_end: {align} \BODY + } + \RenewEnviron{#1*} + { + \cs:w db_multiline_eq:nV\cs_end: {align*} \BODY + } +} +\seq_new:N \l_db_multiline_eq_seq +\cs_new_protected:Nn \db_multiline_eq:nn +{ + \int_gincr:N \g_multiline_eq_int + \int_zero:N \g_line_of_multiline_eq_int + \int_gincr:N \g_line_of_multiline_eq_int + \tl_gset:Nx \g_tmpa_tl { + multilineeq + - + \int_use:N \g_multiline_eq_int + - + line + - + } + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} + } + \ltx@label{\g_line_of_multiline_eq_label_tl} + % + \seq_set_split:Nnn \l_db_multiline_eq_seq { \\ } { #2 } + \tl_if_in:nnTF {#1} {multline} { + \begin{amsmath#1} + \bool_gset_true:N \g__nwejm_within_patched_amsmath_env_bool + \seq_use:Nnnn \l_db_multiline_eq_seq + { \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@space }{ \multiline@double@backslash@add@double@space } + \hfill + \end{amsmath#1} + \bool_gset_false:N \g__nwejm_within_patched_amsmath_env_bool + }{ + \begin{amsmath#1} + \bool_gset_true:N \g__nwejm_within_patched_amsmath_env_bool + \seq_use:Nn \l_db_multiline_eq_seq { \multiline@double@backslash } + \end{amsmath#1} + \bool_gset_false:N \g__nwejm_within_patched_amsmath_env_bool + } + } +\cs_generate_variant:Nn \db_multiline_eq:nn { nV } +\cs_new_protected:Nn \db_multiline_double_backslash:nn +{ + \db_add_marginal_note: + \IfValueTF{#2}{% + \IfBooleanTF{#1}{\\*[#2]}{\\[#2]}% + }{% + \IfBooleanTF{#1}{\\*}{\\}% + }% + % + \db_add_multiline_eq_label: +} +\NewDocumentCommand{\multiline@double@backslash}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} +} +\NewDocumentCommand{\multiline@double@backslash@add@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{\mathindent} +} +\NewDocumentCommand{\multiline@double@backslash@add@double@space}{so}{% + \db_multiline_double_backslash:nn {#1}{#2} + \hspace{2\mathindent} +} +\cs_new_protected:Nn \db_add_marginal_note: +{ + \int_compare:nNnT { + \getpagerefnumber{\g_next_line_of_multiline_eq_label_tl}% + }>{ + \getpagerefnumber{\g_line_of_multiline_eq_label_tl}% + }{ + \reversemarginpar + \marginnote[\g__nwejm_equation_continues_next_page_tl]{} + \normalmarginpar + \marginnote[\g__nwejm_equation_continues_next_page_tl]{} + } +} +\tl_gset:Nn \g__nwejm_equation_continues_next_page_tl { + \tiny + \sffamily + \slshape + ( + \GetTranslation{equation-continues-next-page} + ) +} +\cs_new_protected:Nn \db_add_multiline_eq_label: +{ + \ifmeasuring@\else + \int_gincr:N \g_line_of_multiline_eq_int + \tl_gset:Nx \g_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_use:N \g_line_of_multiline_eq_int + } + \tl_gset:Nx \g_next_line_of_multiline_eq_label_tl { + \g_tmpa_tl + \int_eval:n {\g_line_of_multiline_eq_int + 1} + } + \ltx@label{\g_line_of_multiline_eq_label_tl}% + \fi +} +\def\MT_intertext: {% + \def\intertext##1{% + \db_add_marginal_note: + \ifvmode\else\\\@empty\fi + \noalign{% + \penalty\postdisplaypenalty\vskip\belowdisplayskip + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + \vbox{\normalbaselines + \ifdim + \ifdim\@totalleftmargin=\z@ + \linewidth + \else + -\maxdimen + \fi + =\columnwidth + \else \parshape\@ne \@totalleftmargin \linewidth + \fi + \noindent\ignorespaces##1\par}% + \penalty\predisplaypenalty\vskip\abovedisplayskip% + \vskip-\lineskiplimit % CCS + \vskip\normallineskiplimit % CCS + \vskip\l_MT_above_intertext_sep + }% + \db_add_multiline_eq_label: + }% + \MH_let:NwN \shortintertext \shortintertext@ +} +\pretocmd{\MT_orig_shortintertext:n}{% + \bool_if:NT \g__nwejm_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_orig_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +\pretocmd{\MT_shortintertext:n}{% + \bool_if:NT \g__nwejm_within_patched_amsmath_env_bool { + \db_add_marginal_note: + } +}{}{} +\apptocmd{\MT_shortintertext:n}{\db_add_multiline_eq_label:}{}{} +\setkeys{\MT_options_name:}{ + original-intertext=false, + original-shortintertext=false +} +\newcommand*{\nwejm@marginnote}{% + \@dblarg\NWEJM@mn@marginnote +} +\newcommand{\NWEJM@mn@marginnote}[2][]{% + \ifhmode + \@bsphack + \begingroup + \ifdim\@savsk>\z@\else + \def\:{\@xifnch}\expandafter\def\: { \futurelet\@let@token\@ifnch}% + \fi + \else + \begingroup + \fi + \@ifnextchar [{\NWEJM@mn__nwejmmarginnote[{#1}]{#2}}{\NWEJM@mn__nwejmmarginnote[{#1}]{#2}[\z@]}% +} +\newcommand{\NWEJM@mn__nwejmmarginnote}{} +\long\def\NWEJM@mn__nwejmmarginnote[#1]#2[#3]{% + \endgroup + \ifhmode + \NWEJM@mn__nwejm@marginnote[{#1}]{#2}[{#3}]% + \@esphack + \else + \NWEJM@mn__nwejm@marginnote[{#1}]{#2}[{#3}]% + \fi +} + +\long\def\NWEJM@mn__nwejm@marginnote[#1]#2[#3]{% + \begingroup + \ifmmode\mn@strut\let\@tempa\mn@vadjust\else + \if@inlabel\leavevmode\fi + \ifhmode\mn@strut\let\@tempa\mn@vadjust\else\let\@tempa\mn@vlap\fi + \fi + \@tempa{% + \vbox to\z@{% + \vss + \@mn@margintest + \if@reversemargin\if@tempswa + \@tempswafalse + \else + \@tempswatrue + \fi\fi + \rlap{% + \ifx\@mn@currxpos\relax + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else\ifx\@mn@currxpos\@empty + \kern\marginnoterightadjust + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos not known,\MessageBreak + using \string\marginnoterightadjust}% + \fi + \else + \if@mn@verbose + \PackageInfo{marginnote}{% + xpos seems to be \@mn@currxpos,\MessageBreak + \string\marginnoterightadjust + \space ignored}% + \fi + \begingroup + \setlength{\@tempdima}{\@mn@currxpos}% + \kern-\@tempdima + \if@twoside\ifodd\@mn@currpage\relax + \kern\oddsidemargin + \else + \kern\evensidemargin + \fi + \else + \kern\oddsidemargin + \fi + \kern 1in + \endgroup + \fi + \fi + \kern\marginnotetextwidth\kern\marginparsep + \vbox to\z@{\kern\marginnotevadjust\kern #3 + \vbox to\z@{% + \hsize\marginparwidth + \linewidth\hsize + \kern-\parskip + \marginfont\raggedrightmarginnote\strut\hspace{\z@}% + \ignorespaces#2\endgraf + \vss}% + \vss}% + }% + }% + }% + \endgroup } \etocsettocdepth{subsection} \@ifpackageloaded{pgfplots}{% @@ -1848,9 +2212,9 @@ }% \SetCiteCommand{\autocite}% }% -\int_new:N \l__nwejm_section_int \cs_set_eq:NN \__nwejm_printbibliography \printbibliography \RenewDocumentCommand \printbibliography { O{} } { + \FloatBarrier% \tl_if_empty:NF {\g__nwejm_article_acknowledgments_tl} { \section*{\GetTranslation{Acknowledgments}} @@ -1932,12 +2296,8 @@ } } \ExplSyntaxOff -\patchcmd{\autonum@saveEnvironmentSubcommands} - {(0,0)\begin} - {(0,0)\hfuzz=\maxdimen\begin} - {}{} %% -%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +%% Copyright (C) 2015-2018 by Denis Bitouze <denis.bitouze@univ-littoral.fr> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either |