diff options
Diffstat (limited to 'Master')
23 files changed, 254 insertions, 2328 deletions
diff --git a/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md b/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md index bc3d831d0c2..f38b8d5a262 100644 --- a/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md @@ -1,5 +1,11 @@ # [Unreleased] +# [1.0.2] - 2021-10-12 + +## Fixed +- Bug gh #4 (https://git.io/JKLYW). +- Fix bug in case of engine other than `pdftex`. + # [1.0.1] - 2020-03-18 ## Fixed diff --git a/Master/texmf-dist/doc/latex/nwejm/README.md b/Master/texmf-dist/doc/latex/nwejm/README.md index a4a1e3ee1dc..ac9ca0586cb 100644 --- a/Master/texmf-dist/doc/latex/nwejm/README.md +++ b/Master/texmf-dist/doc/latex/nwejm/README.md @@ -8,7 +8,7 @@ new journal "North-Western European Journal of Mathematics". Release ------- -2020-03-18 v1.0.1 +2021-10-12 v1.0.2 Development ----------- diff --git a/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl b/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl index d4c7bd4fb52..675b6d3bca5 100644 --- a/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl +++ b/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl @@ -16,7 +16,6 @@ #include:booktabs #include:mathtools #include:ntheorem -#include:rsfso #include:esvect #include:kpfonts #include:translations diff --git a/Master/texmf-dist/doc/latex/nwejm/english/documentation/latexmkrc b/Master/texmf-dist/doc/latex/nwejm/english/documentation/latexmkrc index 9573be4e17f..6dbfae28169 100644 --- a/Master/texmf-dist/doc/latex/nwejm/english/documentation/latexmkrc +++ b/Master/texmf-dist/doc/latex/nwejm/english/documentation/latexmkrc @@ -1,4 +1,4 @@ -$pdf_mode = 1; +$pdf_mode = 4; $bibtex_use = 1; $bibtex = 'biber -U %O %B'; diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf Binary files differindex 7feb9e7aecd..58642fe6091 100644 --- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf +++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf Binary files differindex d2903f53692..be7d4dbd559 100644 --- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf +++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf Binary files differindex 41d01bc30fc..15decf8727d 100644 --- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf +++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf Binary files differindex 6efa40cd707..f7f8fb9e3f7 100644 --- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf +++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf Binary files differindex accb1742418..e16f6d58f17 100644 --- a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf +++ b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/latexmkrc b/Master/texmf-dist/doc/latex/nwejm/examples/latexmkrc new file mode 100644 index 00000000000..49fd468239d --- /dev/null +++ b/Master/texmf-dist/doc/latex/nwejm/examples/latexmkrc @@ -0,0 +1,12 @@ +$pdf_mode = 1; + +$clean_ext .= ' synctex.gz* run.xml tex.bak out sta bbl bcf fdb_latexmk run tdo + listing *~ lo* xdy vrb ain atfi nav snm thm iny xref db* listing tcbtemp aux + idx ind lof lot out toc acn acr alg glg* glo* gls* ins sbl slg sym ist + run.xml xdy lol fls unq synctex.gz mw *~ aux bcf frm msk nlg nls ntn tcbtemp + thm nav nlo not i dx ind lof lot out toc acn acr alg glg glo gls glg2 gls2 + glo2 sbl slg slo sls sym glsdefs ist run.xml xdy lol fls unq synctex.gz *~ + listing png tkzfct.gnuplot tkzfct.table mw snm tns vrb xref 4ct 4tc idv + lg pre tmp *.typo' *__nwejm.bib ; + + diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf Binary files differindex f88087ab2c0..af2d60cdaf4 100644 --- a/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf +++ b/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf diff --git a/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc b/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc index 9573be4e17f..6dbfae28169 100644 --- a/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc +++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc @@ -1,4 +1,4 @@ -$pdf_mode = 1; +$pdf_mode = 4; $bibtex_use = 1; $bibtex = 'biber -U %O %B'; diff --git a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf Binary files differindex 904ea3ea752..7bcce827062 100644 --- a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf +++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf diff --git a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex index f9a327dba69..e98b2ce38a8 100644 --- a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex +++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex @@ -1,9 +1,18 @@ +\ExplSyntaxOn +\msg_new:nnn{nwejm}{LuaLaTeX~mandatory}{This~ documentation~ has~ to~ be~ + compiled~ with~ LuaLaTeX~ only} +\sys_if_engine_luatex:F +{ + \msg_error:nn{nwejm}{LuaLaTeX~mandatory} +} +\ExplSyntaxOff +% \documentclass[french,nolocaltoc]{nwejmart} % -\DTMsavedate{release-date}{2020-03-18} -\newcommand{\releaseversion}{1.0.1} +\DTMsavedate{release-date}{2021-10-12} +\newcommand{\releaseversion}{1.0.2} % -\usepackage{denisbdoc} +\usepackage[nwejm]{denisbdoc} \usepackage{tabulary} \usepackage[firstpage]{draftwatermark} % @@ -17,8 +26,6 @@ \makeindex[columns=2] \tcbset{index format=off} % -\lstMakeShortInline[style=dbtex]| -% \tcbset{listing options={escapechar=+}} % \SetWatermarkColor{gray!10}% @@ -114,7 +121,7 @@ classe a pour but : \begin{dbwarning}{Codage d'entrée \protect\lstinline+UTF-8+ obligatoire}{} La \nwejmauthorcl{} du \nwejm{} repose de façon cruciale sur un codage - d'entrée en |UTF-8| : + d'entrée en ×UTF-8× : \begin{itemize} \item elle charge le \Package{inputenc}\footnote{% Il convient donc de \emph{ne pas} charger ce package : on se reportera @@ -125,7 +132,7 @@ classe a pour but : % avec l'option \docAuxKey{utf8} ; \item elle suppose que les fichiers sources \file{.tex} sont effectivement - codés en |UTF-8| : on veillera donc à ce que l'éditeur utilisé soit réglé + codés en ×UTF-8× : on veillera donc à ce que l'éditeur utilisé soit réglé sur ce codage d'entrée. \end{itemize} \end{dbwarning} @@ -209,7 +216,7 @@ options de classe suivantes. \begin{dbwarning}{Commande \protect\refCom{articlesetup} : pas en préambule !}{} La commande \refCom{articlesetup} doit être utilisée \emph{exclusivement} dans - le corps du document (de préférence juste après |\begin{document}|) sans quoi + le corps du document (de préférence juste après ×\begin{document}×) sans quoi la configuration choisie, certes prise en compte dans l'article isolé, risque de ne pas l'être dans le volume complet ! \end{dbwarning} @@ -712,8 +719,8 @@ La \nwejmauthorcl{} : \begin{dbremark}{Syntaxes équivalentes pour la fonction exponentielle}{} Il y a équivalence entre les commandes : \begin{itemize} - \item |\E[|\meta{argument}|]| qui est fournie par la classe ; - \item |\E^{|\meta{argument}|}| qui est plus habituelle. + \item ×\E[×\meta{argument}×]× qui est fournie par la classe ; + \item ×\E^{×\meta{argument}×}× qui est plus habituelle. \end{itemize} \end{dbremark} @@ -825,7 +832,7 @@ La \nwejmauthorcl{} : \begin{docCommand}{tanh}{} Cette commande affiche la tangente hyperbolique : \enquote{$\tanh$}. \begin{dbremark}{Pas de commande \protect\docAuxCommand{th} pour la tangente hyperbolique}{} - La commande |\th| est déjà définie dans \LaTeX{} et ne peut donc pas être + La commande ×\th× est déjà définie dans \LaTeX{} et ne peut donc pas être utilisée pour la tangente hyperbolique. \end{dbremark} \end{docCommand} @@ -898,7 +905,7 @@ Ces commandes ayant toutes la même syntaxe, seule celle de la commande \end{docCommand*} \begin{docCommand}{norm*}{\marg{argument}} - Cette commande est équivalente à |\norm[0]{|\meta{argument}|}|. + Cette commande est équivalente à ×\norm[0]{×\meta{argument}×}×. \end{docCommand} \begin{bodycode}[listing and text] @@ -995,7 +1002,7 @@ de délimiteurs au moyen de la commande \refCom{NewPairedDelimiter}. \begin{docCommand}{Div}{} Cette commande affiche la divergence : \enquote{$\Div$}. \begin{dbremark}{Pas de commande \protect\docAuxCommand{div} pour la divergence}{} - La commande |\div| est déjà définie dans \LaTeX{} et ne peut donc pas être + La commande ×\div× est déjà définie dans \LaTeX{} et ne peut donc pas être utilisée pour la divergence. \end{dbremark} \end{docCommand} @@ -1059,7 +1066,7 @@ le déclarer au moyen de la commande \refCom{BinaryOperators}. \begin{tabular}{>{$}l<{$}@{ : }l} \grad \cdot F & bon \\ \grad \mybinop F & mauvais \\ \BinaryOperators{\mybinop}% - \grad \mybinop F & bon (grâce à \verb|\BinaryOperators{\mybinop}|) + \grad \mybinop F & bon (grâce à \verb+\BinaryOperators{\mybinop}+) \end{tabular} \end{bodycode} @@ -1147,11 +1154,11 @@ en forme variables. La \nwejmauthorcl{} fournit effectivement trois styles de \centering % \setlength{\tymin}{\widthof{romain, terminé}} \begin{tabulary}{\linewidth}{lLLL} -Style & Titre récurrent & Contenu & \enquote{Théorèmes} concernés \\\toprule -\docValue{theorem} & gras, romain, numéroté & italique - & théorèmes, corollaires, conjectures, propositions, lemmes, axiomes \\\midrule -\docValue{definition} & gras, romain, numéroté & romain & définitions, remarques, exemples, notations \\\midrule -\docValue{proof} & non gras, italique, non numéroté & romain, terminé par un carré blanc & preuves \\\bottomrule + Style & Titre récurrent & Contenu & \enquote{Théorèmes} concernés \\\toprule + \docValue{theorem} & gras, romain, numéroté & italique + & théorèmes, corollaires, conjectures, propositions, lemmes, axiomes \\\midrule + \docValue{definition} & gras, romain, numéroté & romain & définitions, remarques, exemples, notations \\\midrule + \docValue{proof} & non gras, italique, non numéroté & romain, terminé par un carré blanc & preuves \\\bottomrule \end{tabulary} \caption{Styles de \enquote{théorèmes} fournis} \label{env-theorems-styles} @@ -1172,7 +1179,7 @@ pas, la commande \refCom{newtheorem} permet d'en créer de nouveaux. l'initiale est en majuscule.} ; \item le style est \docValue{theorem}. \end{itemize} - Cette commande crée également l'environnement étoilé \meta{nom}|*| produisant + Cette commande crée également l'environnement étoilé \meta{nom}×*× produisant des occurrences \emph{non} numérotées de ce \enquote{théorème}. \begin{preamblecode}[listing options={deletekeywords={[2]article}}] @@ -1529,8 +1536,8 @@ fournit notamment les commandes \refCom{cref} et \refCom{vref} suivantes. \begin{docCommand}{cref}{\brackets{\meta{label$_1$},...,\meta{label$_n$}}} Si un ou plusieurs objets\objets{} sont labellisés au moyen de - \lstinline[deletekeywords={[2]label}]|\label{|\meta{label$_1$}|}|,..., - \lstinline[deletekeywords={[2]label}]|\label{|\meta{label$_n$}|}|, la commande + \lstinline[deletekeywords={[2]label}]×\label{×\meta{label$_1$}×}×,..., + \lstinline[deletekeywords={[2]label}]×\label{×\meta{label$_n$}×}×, la commande \refCom{cref} : \begin{itemize} \item en affiche les numéros\footnote{Entourés de parenthèses quand c'est @@ -1579,9 +1586,9 @@ On se reportera aux \vref{sec-titre,sec-auteurs} [...] % 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 +% \item ×equation×, ×align×, ×gather×, ×multline× et ×flalign× qui numérotent % leur contenu ; -% \item |equation*|, |align*|, |gather*|, |multline*| et |flalign*| qui \emph{ne} +% \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 @@ -1740,18 +1747,18 @@ d'extrait\autocite[Pour plus de détails, cf. par exemple][]{Bitouze}. Le \Package*{hyperref} fournit (entre autres) la commande \refCom{url} qui permet de facilement afficher des adresses Web, aussi appelées \enquote{\gls{url}}, même si elles comportent des caractères spéciaux de \TeX{} -(|#|, +(×#×, % \lstinline[commentstyle={}]+%+, % -|_|, |~|, |&|, etc.) : ces caractères peuvent donc être saisis tels quels, sauf +×_×, ×~×, ×&×, etc.) : ces caractères peuvent donc être saisis tels quels, sauf si la commande \refCom{url} est utilisée dans l'argument d'une autre commande\footnote{Par exemple \protect\docAuxCommand*{footnote}.} auquel cas les -caractères |#| et +caractères ×#× et % \lstinline[commentstyle={}]+%+ % -sont alors à faire précéder de la commande \enquote{d'échappement} |\| +sont alors à faire précéder de la commande \enquote{d'échappement} ×\× (contre-oblique).% \begin{docCommand}{url}{\marg{adresse Web}} @@ -1866,7 +1873,7 @@ différents packages sont donc à disposition des auteurs de la \nwejm{}. \begin{description} \item[option par défaut :] \docAuxKey{autostyle} ; \item[réglage par défaut :] - \lstinline[alsolanguage={[csquotes]TeX},alsolanguage={[biblatex]TeX}]|\SetCiteCommand{\autocite}| ; + \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 : @@ -1877,9 +1884,9 @@ différents packages sont donc à disposition des auteurs de la \nwejm{}. hypertextes\footnote{Cf. \vref{sec-url}.} : \begin{description} \item[option par défaut :] \docAuxKey{hidelinks}, - \docAuxKey{pdfencoding}\lstinline[alsolanguage={[hyperref]TeX}]|=unicode|, + \docAuxKey{pdfencoding}\lstinline[alsolanguage={[hyperref]TeX}]×=unicode×, \docAuxKey{final}, \docAuxKey{breaklinks}, - \docAuxKey{hypertexnames}|=false| ; + \docAuxKey{hypertexnames}×=false× ; \end{description} \item[\package{glossaries} :] création de glossaires et (listes d')acronymes : \begin{description} @@ -1917,7 +1924,7 @@ notables sont précisés. \item[option par défaut :]\ \begin{itemize} \item \docAuxKey{detect-all} ; - \item \docAuxKey{locale}|=|\docValue{FR} ou \docValue{UK} ou \docValue{DE} + \item \docAuxKey{locale}×=×\docValue{FR} ou \docValue{UK} ou \docValue{DE} selon la langue de l'article ; \end{itemize} \end{description} @@ -2027,7 +2034,7 @@ Pour éviter certaines confusions, les espaces dans les codes sources devant La présente classe, ainsi que certaines de ses commandes et certains de ses environnements, peuvent être modulés au moyen d'options, ou listes d'options (séparées par des virgules). Ces options peuvent se présenter sous la forme -\meta{clé}|=|\meta{valeur} et la \meta{valeur} passée à une \meta{clé} peut +\meta{clé}×=×\meta{valeur} et la \meta{valeur} passée à une \meta{clé} peut être : %^^A \begin{description} %^^A \item[ne prennent pas de valeur.] Une telle option, par exemple nommée diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx index 01bab653f01..86bfb0627ba 100644 --- a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx +++ b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx @@ -13,7 +13,7 @@ new journal "North-Western European Journal of Mathematics". Release ------- -2020-03-18 v1.0.1 +2021-10-12 v1.0.2 Development ----------- @@ -44,7 +44,7 @@ https://github.com/dbitouze/nwejm. \input l3docstrip.tex \Msg{********************************************************} \Msg{* Installation} -\Msg{* Class: nwejm 2020-03-18 v1.0.1} +\Msg{* Class: nwejm 2021-10-12 v1.0.2} \Msg{* for the journal} \Msg{* "North-Western European Journal of Mathematics" (DB)} \Msg{********************************************************} @@ -61,7 +61,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later \endpreamble \postamble -Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +Copyright (C) 2015-2021 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 @@ -174,6 +174,12 @@ Running "make install" installs the files in the local TeX tree. % %\maketitle % +% \changes{v1.0.2}{2021-10-12}{% +% \begin{itemize} +% \item Fix gh \#4 (\url{https://git.io/JKLYW}). +% \item Fix bug in case of other engine than \hologo{pdfTeX}. +% \end{itemize} +% }% % \changes{v1.0.1}{2020-03-18}{% % \begin{itemize} % \item Fix bugs due to \Package{expl3} changes. @@ -317,8 +323,8 @@ Running "make install" installs the files in the local TeX tree. \ProvidesExplClass %<class> {nwejm} %<class-article> {nwejmart} - {2020-03-18} - {1.0.1} + {2021-10-12} + {1.0.2} { Class for the journal "North-Western European Journal of Mathematics". } @@ -373,8 +379,8 @@ Running "make install" installs the files in the local TeX tree. can~be~used~only~in~document~body~and~not~in~preamble!}% \msg_new:nnn{nwejmart}{Article~setup~not~consistent}{The~ article~ setup~ concerning~ the~ option~ `#1'~ has~ changed~ after~ its~ 1st~ use.~ Please~ - use~ \articlesetup~ command~ just~ once,~ just~ after~ the~ beginning~ of~ - the~ document.}% + use~ `\string\articlesetup'~ command~ just~ once,~ just~ after~ the~ + beginning~ of~ the~ document.}% \msg_new:nnn{ %<class-article> nwejmart %<class> nwejm @@ -442,13 +448,11 @@ Running "make install" installs the files in the local TeX tree. \bool_gset_true:N \g_@@_language_specified_bool% \PassOptionsToPackage{main=#1}{babel} \PassOptionsToPackage{#1}{varioref} - \AtBeginDocument{ + \AddToHook{begindocument/before}{% \LoadDictionaryFor{#1}{nwejm} - } - \AtEndPreamble{% \FCloadlang{#1} } - \AfterEndPreamble{% + \AddToHook{begindocument/end}{% \selectlanguage{#1} } } @@ -574,7 +578,7 @@ Running "make install" installs the files in the local TeX tree. % We load the dictionaries containing the translations needed for theorems and % the like. % \begin{macrocode} -\AtBeginDocument{ +\AddToHook{begindocument/before}{ \LoadDictionaryFor{french}{nwejm} \LoadDictionaryFor{english}{nwejm} \LoadDictionaryFor{dutch}{nwejm} @@ -608,23 +612,37 @@ Running "make install" installs the files in the local TeX tree. \RequirePackage[l2tabu,orthodox]{nag} % \end{macrocode} % -% \item In case of \hologo{pdfTeX} engine, we enforce \pkg{inputenc} to be -% loaded with its \docAuxKey*{utf8} option. Otherwise \pkg{fontspec}, -% convenient for both \hologo{XeLaTeX} and \hologo{LuaLaTeX}, is loaded with -% ligatures à la \TeX{} by default enabled. +% \item In case of \hologo{pdfTeX} engine, we enforce \pkg{fontenc} to be +% loaded with its \docAuxKey*{T1} option. Otherwise \pkg{fontspec}, +% convenient for both \hologo{XeLaTeX} and \hologo{LuaLaTeX}, is loaded by the +% \pkg{unicode-math} package. % \begin{macrocode} \sys_if_engine_pdftex:TF - { - \RequirePackage[utf8]{inputenc} - }{ - \RequirePackage{fontspec} - \DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\ } - } +{ % \end{macrocode} % % \item Standard package for selecting font encodings: % \begin{macrocode} -\RequirePackage[T1]{fontenc} + \RequirePackage[T1]{fontenc} +% \end{macrocode} +% +% \item Load of main font to be used: +% \begin{macrocode} + \RequirePackage[easyscsl,noDcommand]{kpfonts} +}{ +% \end{macrocode} +% +% \item Unicode mathematics support for \hologo{XeTeX} and \hologo{LuaTeX}: +% \begin{macrocode} + \RequirePackage{unicode-math} +% \end{macrocode} +% +% \item OTF version of the Kp-fonts for both roman and sans-serif font, but +% LatinModern for the monospaced one. +% \begin{macrocode} + \RequirePackage[noDcommand]{kpfonts-otf} + \setmonofont[Scale = MatchLowercase]{Latin Modern Mono} +} % \end{macrocode} % % \item Formatting both header and footers (pagestyle), and sections headers: @@ -704,9 +722,7 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % % \item Extension to \Pkg{amsmath}: correct various bugs/defeciencies in amsmath -% and useful tools for mathematical typesetting\footnote{The \Pkg{mathtools} -% loads \pkg{amsmath}, hence it's not necessary to load the -% latter. It has to be loaded before \pkg{datatool} and \pkg{kpfonts}.}: +% and useful tools for mathematical typesetting: % \begin{macrocode} \RequirePackage{mathtools} % \end{macrocode} @@ -716,22 +732,11 @@ Running "make install" installs the files in the local TeX tree. \RequirePackage[amsmath,thmmarks,fleqn]{ntheorem} % \end{macrocode} % -% \item Support for using RSFS fonts in maths: -% \begin{macrocode} -\RequirePackage{rsfso} -% \end{macrocode} -% % \item Vector arrows: % \begin{macrocode} \RequirePackage{esvect} % \end{macrocode} % -% Load of main font to be used: -% \begin{macrocode} -\RequirePackage[easyscsl,noDcommand]{kpfonts} -% %<class-article>\RequirePackage[noDcommand]{kpfonts} -% \end{macrocode} -% % \item Flexible and easy interface to page dimensions: % \begin{macrocode} \RequirePackage{geometry} @@ -909,7 +914,7 @@ Running "make install" installs the files in the local TeX tree. % \item Hypertext marks: % \begin{macrocode} \RequirePackage[pdfencoding=unicode,final]{hyperref}% -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% % \end{macrocode} @@ -1872,7 +1877,7 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \box_new:N \l_@@_journal_logo_box \box_new:N \l_@@_journal_name_box - \AfterEndPreamble{% + \AddToHook{begindocument/end}{% \hbox_set:Nn \l_@@_journal_name_box { \bfseries% @@ -1937,7 +1942,7 @@ Running "make install" installs the files in the local TeX tree. % \end{itemize} % % \begin{macrocode} -\AtBeginDocument{% +\AddToHook{begindocument}{% \graphicspath{{\c_@@_issue_images_path_string_tl//}{../\c_@@_issue_images_path_string_tl//}} % \glsdisablehyper } @@ -1955,7 +1960,7 @@ Running "make install" installs the files in the local TeX tree. % to be different. % \end{itemize} % \begin{macrocode} -%<class-article> \AfterEndPreamble{\g_@@_mainmatter_switch_tl} +%<class-article> \AddToHook{begindocument/end}{\g_@@_mainmatter_switch_tl} % \end{macrocode} % % \section{Options} @@ -2737,10 +2742,10 @@ Running "make install" installs the files in the local TeX tree. rectangle (current~page.south~east); % laboratory logo \node[anchor=south~east] at ([xshift=-10mm]current~page~text~area.south~east) - {\includegraphics[height=.66\c_@@_logos_rectangle_height_dim]{logo-painleve}} ; + {\includegraphics[height=.5\c_@@_logos_rectangle_height_dim]{logo-painleve}} ; % university logo \node[anchor=south~west] at (current~page~text~area.south~west) - {\includegraphics[height=.66\c_@@_logos_rectangle_height_dim]{logo-ul1-ufr-math}} ; + {\includegraphics[height=.5\c_@@_logos_rectangle_height_dim]{ul-fst-math}} ; % crop marks \draw [white] ([xshift=2.5mm]current~page~text~area.north~east) -- @@ -2872,7 +2877,7 @@ Running "make install" installs the files in the local TeX tree. %<class-article> %<class-article>\file_if_exist:nT { \c_@@_main_file_name_tl.aux } %<class-article>{\externaldocument[@@-]{\c_@@_main_file_name_tl} -%<class-article> \AfterEndPreamble{\setcounter{page}{\number\numexpr\getpagerefnumber{@@-\currfilebase}}} +%<class-article> \AddToHook{begindocument/end}{\setcounter{page}{\number\numexpr\getpagerefnumber{@@-\currfilebase}}} %<class-article>} % \end{macrocode} % @@ -3292,6 +3297,14 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % +% \begin{macrocode} +%</class|class-article> +% \end{macrocode} +% +% \begin{macrocode} +%<*class> +% \end{macrocode} +% % \subsection{Input variant} % % We create a variant of the "\input" macro to be use for the input of each @@ -3301,6 +3314,7 @@ Running "make install" installs the files in the local TeX tree. % \url{https://tex.stackexchange.com/q/475788/18401}). % \begin{macrocode} \NewDocumentCommand \inputarticle { O{english} m } {% + \int_gincr:N \g_@@_articles_int \newrefsection \renewcommand*{\glspluralsuffix}{s} \renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} @@ -3309,6 +3323,7 @@ Running "make install" installs the files in the local TeX tree. \str_case:nn {#1} { {english} { \selectlanguage{english} + % \shorthandoff{"}% \renewcommand*{\glossaryname}{Glossary}% \renewcommand*{\acronymname}{Acronyms}% \renewcommand*{\entryname}{Notation}% @@ -3320,6 +3335,7 @@ Running "make install" installs the files in the local TeX tree. } {german} { \selectlanguage{ngerman} + % \shorthandon{"}% \renewcommand*{\glossaryname}{Glossar}% \renewcommand*{\acronymname}{Akronyme}% \renewcommand*{\entryname}{Bezeichnung}% @@ -3331,6 +3347,7 @@ Running "make install" installs the files in the local TeX tree. } {ngerman} { \selectlanguage{ngerman} + % \shorthandon{"}% \renewcommand*{\glossaryname}{Glossar}% \renewcommand*{\acronymname}{Akronyme}% \renewcommand*{\entryname}{Bezeichnung}% @@ -3342,6 +3359,7 @@ Running "make install" installs the files in the local TeX tree. } {french} { \selectlanguage{french} + % \shorthandoff{"}% % \end{macrocode} % % Though we switch to \pkg{babel}'s ×french×, footnotes are not displayed as @@ -3363,6 +3381,7 @@ Running "make install" installs the files in the local TeX tree. } {dutch} { \selectlanguage{dutch} + % \shorthandon{"}% \renewcommand*{\glossaryname}{Woordenlijst}% \renewcommand*{\acronymname}{Acroniemen}% \renewcommand*{\entryname}{Benaming}% @@ -3406,6 +3425,11 @@ Running "make install" installs the files in the local TeX tree. } } % \end{macrocode} +% We ensure the sections' counter will be printed as arabic numerals (in case +% ×\appendix× has been used in a previous article): +% \begin{macrocode} + \gdef\thesection{\@arabic\c@section} +% \end{macrocode} % We reset all acronyms entries. % \begin{macrocode} \glsresetall @@ -3413,6 +3437,14 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % +% \begin{macrocode} +%</class> +% \end{macrocode} +% +% \begin{macrocode} +%<*class|class-article> +% \end{macrocode} +% % \section{(Re)Definition of document commands that identify the article} % % The names of the authors of the different articles will appear at several @@ -3424,7 +3456,7 @@ Running "make install" installs the files in the local TeX tree. % This can be done only at the beginning of the document, in order to know the % characteristics of the current issue. % \begin{macrocode} -\AtBeginDocument{% +\AddToHook{begindocument}{% % \end{macrocode} % % We first create a token list containing the date of the current issue formated @@ -3476,7 +3508,6 @@ Running "make install" installs the files in the local TeX tree. % We increment the "\g_@@_articles_int" integer that counts the number of % articles in order to provide for each of them a unique bibliographic key. % \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 @@ -3977,7 +4008,7 @@ Running "make install" installs the files in the local TeX tree. % instead of begin of the document in order some settings needed in preamble are % taken in account. % \begin{macrocode} -%<class>\AtEndPreamble{\file_input:n {\c_@@_configuration_file_string_tl}} +%<class>\AddToHook{begindocument/before}{\file_input:n {\c_@@_configuration_file_string_tl}} % \end{macrocode} % % \subsection{Miscellaneous} @@ -4353,7 +4384,7 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \RenewDocumentCommand \newtheorem { O{} m } { - \AtBeginDocument{ + \AddToHook{begindocument}{ \tl_clear:N \l_@@_newtheorem_style_tl \tl_clear:N \l_@@_newtheorem_title_tl \tl_clear:N \l_@@_newtheorem_french_title_tl @@ -4582,7 +4613,7 @@ Running "make install" installs the files in the local TeX tree. } } } -\AfterEndPreamble{ +\AddToHook{begindocument/end}{ \ifcurrentbaselanguage{french}{\g_@@_french_crefname_tl}{} } % \end{macrocode} @@ -5197,7 +5228,7 @@ Running "make install" installs the files in the local TeX tree. % 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} +\AddToHook{begindocument/before}{\allowdisplaybreaks} % \end{macrocode} % % The drawback of ×\allowdisplaybreaks× macro is it may happen we haven't @@ -5626,7 +5657,7 @@ Running "make install" installs the files in the local TeX tree. % header and footer on the page (and the following ones until the next article) % where the bibliography appears). % \begin{macrocode} -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \defbibheading{_@@_subbibliography}[\refname]{% \section*{#1} }% @@ -5731,18 +5762,21 @@ Running "make install" installs the files in the local TeX tree. % is not robust in \pkg{kpfonts} code % (cf. \url{https://groups.google.com/d/msg/fr.comp.text.tex/hIi97ipK5qA/WJoPwvH-p1UJ}). % \begin{macrocode} -\ifkp@easyscsl -\DeclareRobustCommand{\itshape}{\not@math@alphabet\itshape\mathit% - \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% - \fontshape\itdefault}\selectfont} -\fi +\sys_if_engine_pdftex:T +{ + \ifkp@easyscsl + \DeclareRobustCommand{\itshape}{\not@math@alphabet\itshape\mathit% + \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% + \fontshape\itdefault}\selectfont} + \fi % \end{macrocode} % % We replace the \pkg{kpfonts}' \enquote{mathfrak} by the one from % \enquote{eufrak}, as the former doesn't provide Euler Fraktur digits. % \begin{macrocode} -\DeclareMathAlphabet\mathfrak{U}{euf}{m}{n} -\SetMathAlphabet\mathfrak{bold}{U}{euf}{b}{n} + \DeclareMathAlphabet\mathfrak{U}{euf}{m}{n} + \SetMathAlphabet\mathfrak{bold}{U}{euf}{b}{n} +} % \end{macrocode} % % \subsection{Related to \Pkg{hyperref}} @@ -5825,7 +5859,7 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % % \begin{macrocode} -\AfterEndPreamble{% +\AddToHook{begindocument/end}{% % \end{macrocode} % % If the cover production is asked, we automatically load some libraries, make @@ -5855,18 +5889,18 @@ Running "make install" installs the files in the local TeX tree. % Because articles' title are displayed thanks to the ×\chapter× command, we % have to format its layout. % \begin{macrocode} -\AfterEndPreamble{% +\AddToHook{begindocument/end}{% \titleformat{\chapter}[block] {\normalfont\centering}{}{0pt}{} \titlespacing*{\chapter}{0pt}{0pt}{0pt} } % \end{macrocode} % -% \Pkg{xy} performs category code changes of ×@× ×\AtBeginDocument× and this +% \Pkg{xy} performs category code changes of ×@× ×\AddToHook{begindocument}× and this % cause troubles (see \url{tex.stackexchange.com/q/303238/18401}). Hence, we % prohibit it. % \begin{macrocode} -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \@ifpackageloaded{xy}{% \msg_error:nn{ %<class-article> nwejmart @@ -5877,6 +5911,16 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % +% % By default, we switch the shorthand character ×"× off used by the Dutch and +% % German languages as they are source of many troubles, especially with the +% % ×tikzcd× environments. +% % \begin{macrocode} +% \AddToHook{begindocument/end}{% +% \shorthandoff{"}% +% \usetikzlibrary{babel}% +% } +% % \end{macrocode} +% % We now leave the \LaTeX3{} programming environment. % \begin{macrocode} \ExplSyntaxOff @@ -6734,7 +6778,6 @@ $clean_ext = "synctex.gz* run.xml tex.bak bbl bcf fdb_latexmk run tdo listing st #include:booktabs #include:mathtools #include:ntheorem -#include:rsfso #include:esvect #include:kpfonts #include:translations @@ -6945,8 +6988,7 @@ dutch % \Finale %%% Local Variables: -%%% mode: tex -%%% eval: (doctex-mode) +%%% mode: doctex %%% ispell-local-dictionary: "english" %%% TeX-command-default: "TeX" %%% TeX-master: t diff --git a/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo-NB.eps b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo-NB.eps deleted file mode 100644 index 7b4e6c6d072..00000000000 --- a/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo-NB.eps +++ /dev/null @@ -1,1029 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%Produced by poppler pdftops version: 0.74.0 (http://poppler.freedesktop.org) -%%Creator: TeX -%%LanguageLevel: 2 -%%DocumentSuppliedResources: (atend) -%%BoundingBox: 0 0 213 259 -%%HiResBoundingBox: 0 0 213 259 -%%DocumentSuppliedResources: (atend) -%%EndComments -%%BeginProlog -%%BeginResource: procset xpdf 3.00 0 -%%Copyright: Copyright 1996-2011 Glyph & Cog, LLC -/xpdf 75 dict def xpdf begin -% PDF special state -/pdfDictSize 15 def -/pdfSetup { - /setpagedevice where { - pop 2 dict begin - /Policies 1 dict dup begin /PageSize 6 def end def - { /Duplex true def } if - currentdict end setpagedevice - } { - pop - } ifelse -} def -/pdfSetupPaper { - % Change paper size, but only if different from previous paper size otherwise - % duplex fails. PLRM specifies a tolerance of 5 pts when matching paper size - % so we use the same when checking if the size changes. - /setpagedevice where { - pop currentpagedevice - /PageSize known { - 2 copy - currentpagedevice /PageSize get aload pop - exch 4 1 roll - sub abs 5 gt - 3 1 roll - sub abs 5 gt - or - } { - true - } ifelse - { - 2 array astore - 2 dict begin - /PageSize exch def - /ImagingBBox null def - currentdict end - setpagedevice - } { - pop pop - } ifelse - } { - pop - } ifelse -} def -/pdfStartPage { - pdfDictSize dict begin - /pdfFillCS [] def - /pdfFillXform {} def - /pdfStrokeCS [] def - /pdfStrokeXform {} def - /pdfFill [0] def - /pdfStroke [0] def - /pdfFillOP false def - /pdfStrokeOP false def - /pdfLastFill false def - /pdfLastStroke false def - /pdfTextMat [1 0 0 1 0 0] def - /pdfFontSize 0 def - /pdfCharSpacing 0 def - /pdfTextRender 0 def - /pdfPatternCS false def - /pdfTextRise 0 def - /pdfWordSpacing 0 def - /pdfHorizScaling 1 def - /pdfTextClipPath [] def -} def -/pdfEndPage { end } def -% PDF color state -/cs { /pdfFillXform exch def dup /pdfFillCS exch def - setcolorspace } def -/CS { /pdfStrokeXform exch def dup /pdfStrokeCS exch def - setcolorspace } def -/sc { pdfLastFill not { pdfFillCS setcolorspace } if - dup /pdfFill exch def aload pop pdfFillXform setcolor - /pdfLastFill true def /pdfLastStroke false def } def -/SC { pdfLastStroke not { pdfStrokeCS setcolorspace } if - dup /pdfStroke exch def aload pop pdfStrokeXform setcolor - /pdfLastStroke true def /pdfLastFill false def } def -/op { /pdfFillOP exch def - pdfLastFill { pdfFillOP setoverprint } if } def -/OP { /pdfStrokeOP exch def - pdfLastStroke { pdfStrokeOP setoverprint } if } def -/fCol { - pdfLastFill not { - pdfFillCS setcolorspace - pdfFill aload pop pdfFillXform setcolor - pdfFillOP setoverprint - /pdfLastFill true def /pdfLastStroke false def - } if -} def -/sCol { - pdfLastStroke not { - pdfStrokeCS setcolorspace - pdfStroke aload pop pdfStrokeXform setcolor - pdfStrokeOP setoverprint - /pdfLastStroke true def /pdfLastFill false def - } if -} def -% build a font -/pdfMakeFont { - 4 3 roll findfont - 4 2 roll matrix scale makefont - dup length dict begin - { 1 index /FID ne { def } { pop pop } ifelse } forall - /Encoding exch def - currentdict - end - definefont pop -} def -/pdfMakeFont16 { - exch findfont - dup length dict begin - { 1 index /FID ne { def } { pop pop } ifelse } forall - /WMode exch def - currentdict - end - definefont pop -} def -% graphics state operators -/q { gsave pdfDictSize dict begin } def -/Q { - end grestore - /pdfLastFill where { - pop - pdfLastFill { - pdfFillOP setoverprint - } { - pdfStrokeOP setoverprint - } ifelse - } if -} def -/cm { concat } def -/d { setdash } def -/i { setflat } def -/j { setlinejoin } def -/J { setlinecap } def -/M { setmiterlimit } def -/w { setlinewidth } def -% path segment operators -/m { moveto } def -/l { lineto } def -/c { curveto } def -/re { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto - neg 0 rlineto closepath } def -/h { closepath } def -% path painting operators -/S { sCol stroke } def -/Sf { fCol stroke } def -/f { fCol fill } def -/f* { fCol eofill } def -% clipping operators -/W { clip newpath } def -/W* { eoclip newpath } def -/Ws { strokepath clip newpath } def -% text state operators -/Tc { /pdfCharSpacing exch def } def -/Tf { dup /pdfFontSize exch def - dup pdfHorizScaling mul exch matrix scale - pdfTextMat matrix concatmatrix dup 4 0 put dup 5 0 put - exch findfont exch makefont setfont } def -/Tr { /pdfTextRender exch def } def -/Tp { /pdfPatternCS exch def } def -/Ts { /pdfTextRise exch def } def -/Tw { /pdfWordSpacing exch def } def -/Tz { /pdfHorizScaling exch def } def -% text positioning operators -/Td { pdfTextMat transform moveto } def -/Tm { /pdfTextMat exch def } def -% text string operators -/xyshow where { - pop - /xyshow2 { - dup length array - 0 2 2 index length 1 sub { - 2 index 1 index 2 copy get 3 1 roll 1 add get - pdfTextMat dtransform - 4 2 roll 2 copy 6 5 roll put 1 add 3 1 roll dup 4 2 roll put - } for - exch pop - xyshow - } def -}{ - /xyshow2 { - currentfont /FontType get 0 eq { - 0 2 3 index length 1 sub { - currentpoint 4 index 3 index 2 getinterval show moveto - 2 copy get 2 index 3 2 roll 1 add get - pdfTextMat dtransform rmoveto - } for - } { - 0 1 3 index length 1 sub { - currentpoint 4 index 3 index 1 getinterval show moveto - 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get - pdfTextMat dtransform rmoveto - } for - } ifelse - pop pop - } def -} ifelse -/cshow where { - pop - /xycp { - 0 3 2 roll - { - pop pop currentpoint 3 2 roll - 1 string dup 0 4 3 roll put false charpath moveto - 2 copy get 2 index 2 index 1 add get - pdfTextMat dtransform rmoveto - 2 add - } exch cshow - pop pop - } def -}{ - /xycp { - currentfont /FontType get 0 eq { - 0 2 3 index length 1 sub { - currentpoint 4 index 3 index 2 getinterval false charpath moveto - 2 copy get 2 index 3 2 roll 1 add get - pdfTextMat dtransform rmoveto - } for - } { - 0 1 3 index length 1 sub { - currentpoint 4 index 3 index 1 getinterval false charpath moveto - 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get - pdfTextMat dtransform rmoveto - } for - } ifelse - pop pop - } def -} ifelse -/Tj { - fCol - 0 pdfTextRise pdfTextMat dtransform rmoveto - currentpoint 4 2 roll - pdfTextRender 1 and 0 eq { - 2 copy xyshow2 - } if - pdfTextRender 3 and dup 1 eq exch 2 eq or { - 3 index 3 index moveto - 2 copy - currentfont /FontType get 3 eq { fCol } { sCol } ifelse - xycp currentpoint stroke moveto - } if - pdfTextRender 4 and 0 ne { - 4 2 roll moveto xycp - /pdfTextClipPath [ pdfTextClipPath aload pop - {/moveto cvx} - {/lineto cvx} - {/curveto cvx} - {/closepath cvx} - pathforall ] def - currentpoint newpath moveto - } { - pop pop pop pop - } ifelse - 0 pdfTextRise neg pdfTextMat dtransform rmoveto -} def -/TJm { 0.001 mul pdfFontSize mul pdfHorizScaling mul neg 0 - pdfTextMat dtransform rmoveto } def -/TJmV { 0.001 mul pdfFontSize mul neg 0 exch - pdfTextMat dtransform rmoveto } def -/Tclip { pdfTextClipPath cvx exec clip newpath - /pdfTextClipPath [] def } def -/Tclip* { pdfTextClipPath cvx exec eoclip newpath - /pdfTextClipPath [] def } def -% Level 2/3 image operators -/pdfImBuf 100 string def -/pdfImStr { - 2 copy exch length lt { - 2 copy get exch 1 add exch - } { - () - } ifelse -} def -/skipEOD { - { currentfile pdfImBuf readline - not { pop exit } if - (%-EOD-) eq { exit } if } loop -} def -/pdfIm { image skipEOD } def -/pdfImM { fCol imagemask skipEOD } def -/pr { 2 index 2 index 3 2 roll putinterval 4 add } def -/pdfImClip { - gsave - 0 2 4 index length 1 sub { - dup 4 index exch 2 copy - get 5 index div put - 1 add 3 index exch 2 copy - get 3 index div put - } for - pop pop rectclip -} def -/pdfImClipEnd { grestore } def -% shading operators -/colordelta { - false 0 1 3 index length 1 sub { - dup 4 index exch get 3 index 3 2 roll get sub abs 0.004 gt { - pop true - } if - } for - exch pop exch pop -} def -/funcCol { func n array astore } def -/funcSH { - dup 0 eq { - true - } { - dup 6 eq { - false - } { - 4 index 4 index funcCol dup - 6 index 4 index funcCol dup - 3 1 roll colordelta 3 1 roll - 5 index 5 index funcCol dup - 3 1 roll colordelta 3 1 roll - 6 index 8 index funcCol dup - 3 1 roll colordelta 3 1 roll - colordelta or or or - } ifelse - } ifelse - { - 1 add - 4 index 3 index add 0.5 mul exch 4 index 3 index add 0.5 mul exch - 6 index 6 index 4 index 4 index 4 index funcSH - 2 index 6 index 6 index 4 index 4 index funcSH - 6 index 2 index 4 index 6 index 4 index funcSH - 5 3 roll 3 2 roll funcSH pop pop - } { - pop 3 index 2 index add 0.5 mul 3 index 2 index add 0.5 mul - funcCol sc - dup 4 index exch mat transform m - 3 index 3 index mat transform l - 1 index 3 index mat transform l - mat transform l pop pop h f* - } ifelse -} def -/axialCol { - dup 0 lt { - pop t0 - } { - dup 1 gt { - pop t1 - } { - dt mul t0 add - } ifelse - } ifelse - func n array astore -} def -/axialSH { - dup 0 eq { - true - } { - dup 8 eq { - false - } { - 2 index axialCol 2 index axialCol colordelta - } ifelse - } ifelse - { - 1 add 3 1 roll 2 copy add 0.5 mul - dup 4 3 roll exch 4 index axialSH - exch 3 2 roll axialSH - } { - pop 2 copy add 0.5 mul - axialCol sc - exch dup dx mul x0 add exch dy mul y0 add - 3 2 roll dup dx mul x0 add exch dy mul y0 add - dx abs dy abs ge { - 2 copy yMin sub dy mul dx div add yMin m - yMax sub dy mul dx div add yMax l - 2 copy yMax sub dy mul dx div add yMax l - yMin sub dy mul dx div add yMin l - h f* - } { - exch 2 copy xMin sub dx mul dy div add xMin exch m - xMax sub dx mul dy div add xMax exch l - exch 2 copy xMax sub dx mul dy div add xMax exch l - xMin sub dx mul dy div add xMin exch l - h f* - } ifelse - } ifelse -} def -/radialCol { - dup t0 lt { - pop t0 - } { - dup t1 gt { - pop t1 - } if - } ifelse - func n array astore -} def -/radialSH { - dup 0 eq { - true - } { - dup 8 eq { - false - } { - 2 index dt mul t0 add radialCol - 2 index dt mul t0 add radialCol colordelta - } ifelse - } ifelse - { - 1 add 3 1 roll 2 copy add 0.5 mul - dup 4 3 roll exch 4 index radialSH - exch 3 2 roll radialSH - } { - pop 2 copy add 0.5 mul dt mul t0 add - radialCol sc - encl { - exch dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - 0 360 arc h - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - 360 0 arcn h f - } { - 2 copy - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a1 a2 arcn - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a2 a1 arcn h - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a1 a2 arc - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a2 a1 arc h f - } ifelse - } ifelse -} def -end -%%EndResource -%%EndProlog -%%BeginSetup -xpdf begin -%%BeginResource: font ORLJZS+Sf-Kp-Medium-Extend_1125 -%!PS-AdobeFont-1.0: Sf-Kp-Medium 001.000 -%%Title: Sf-Kp-Medium -%Version: 001.000 -%%CreationDate: Fri Apr 16 10:18:02 2010 -%%Creator: Christophe -%Copyright: Version 1.0 -% Generated by FontForge 20081224 (http://fontforge.sf.net/) -%%EndComments -10 dict begin -/FontType 1 def -/FontMatrix [0.001125 0 0 0.001 0 0 ]readonly def -/FontName /ORLJZS+Sf-Kp-Medium-Extend_1125 def -/FontBBox {-150 -243 1291 917 }readonly def -/PaintType 0 def -/FontInfo 9 dict dup begin -/version (001.000) readonly def -/Notice (Version 1.0) readonly def -/FullName (Sf-Kp-Medium) readonly def -/FamilyName (Sf-Kp) readonly def -/Weight (Medium) readonly def -/ItalicAngle 0 def -/isFixedPitch false def -/UnderlinePosition -133 def -/UnderlineThickness 20 def -end readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 69 /E put -dup 74 /J put -dup 77 /M put -dup 78 /N put -dup 87 /W put -readonly def -currentdict end -currentfile eexec -d9d66f633b846ab284bcf8b0411b772de5ce32340dc6f28af40857e4451976e7 -5182433cf9f333a38bd841c0d4e68bf9e012eb32a8ffb76b5816306b5edf7c99 -8b3a16d9b4bc056662e32c7cd0123dfaeb734c7532e64bbfbf5a60336e646716 -efb852c877f440d329172c71f1e5d59ce9473c26b8aef7ad68ef0727b6ec2e0c -02ce8d8b07183838330c0284bd419cbdae42b141d3d4be492473f240ceed931d -46e9f999c5cb3235e2c6daaa2c0169e1991beaea0d704bf49cea3e98e8c2361a -4b60d020d325e4c24518fb902882f4bc8481286273cc5090abeaaa92c0a19014 -0b0deba74531f5dedded2a3c33ed3d9bdb0cb9eb9c4475bc1c64758df399adb9 -df7260ad4c9f090b0ba4f2530bc4c0f6bcca606c9ce1829f203e58a8b8186b13 -910b37638d2d637c12d3c9a802475a1396402e309d94705fbdf7a68585771c25 -9ec121a078e82c9401044443def92f425545ae1f09bb674368ddb91d4c293c88 -f255fe9fae882f0c91bb9d2c594ef6306449d103ee5ed4f18f80ced7caad1402 -d1f14b37e371cc6d0ecb22b1e326ba3179178b767c002ecf1ce688436fe05613 -47882ee217002bc4a332eb8d7c41eec0751ef891d378fe0be7119a674bc7f026 -77b7cb5d870504638e37ff7bb0c06a9643bad2607416b62875cd4bad17052ef1 -11592fe433dfae88867ff7dd462e5ac8f4e330e04f1881824ca058c2022316b5 -b5a851e1c966dd3904413e9106db56d5ac8bc163b8b5963735590a40fa7b76f6 -9a4c6058842f3d7fee84786e8a68bde7f165b5967c6c25685b02cd76942fe281 -4d155111e1371b39b2c24ea48ddaf2e3fb915994b29b9fe8f26bf9f8655cdf91 -a7fae0f6b090734f6aba396f0c8359dd4dc01c0a11fc3eda722798fdc5ca5f2e -a7330b8b4fc157ca7a64daa0d6f227b94006558a8306086d396b7cc26e767ea7 -025ad6f34ccbf9c164b9366cad9d1f10c6ec98bc2fee9dfe1a9a759c56e85d1c -a98c737ca196de929d523dbdd461201dd3b1fadd98fca67bf664e5ef68792c2e -5e39057bd31bd973ce00b4771901f4b7adce6ebf74345ee67ed6757b856ddcc6 -2a1b02f43e91625582e140f3cd6854acf46d3db5cc080f6b923adecde192f62f -04dd31025fde751b43c995d4f08b0af5d380ec5fd36aa34e6c58f1ddf797cd0d -2503cb7c233f39e0b1bd0643ead066517b5e8c48f856ac3c116deff095fa948a -e70b608d931eeca7fdbeb1daac5bdc9a9e1034794fa2be1d6bf67b9cacf5bd77 -82454c6cb74f0a19756a00758df5407eb5ee7751e5e937bbe0776ed77fdae88d -33ac9465a5b10ab5094931cbfb95b6ab9bbdb38aaa27630a9b04301e65e6aad2 -64b266076725e147f311f15a3c5a1571e9cbb63fb2e908fdf71933a199594e1e -d61d28f3a9017780009ddead07135cbb70b81d3dd53483be7cfaa66508b35130 -6236464e9e509282cd12a5d63166addb5cb5befa7092b483c9a4f08a49b356db -2c444b2d79136c22c73a0eed657d7f91790777e7d8b1ebafb0e020685f5e2937 -c95b50d07c6316abc08495ef319006b45104e76e3846515c25c53dbf61fb3614 -b78ccf06c2e49cd8d7cf9fb27d90834aff6d3af0118fb8b37e5424bff39434e3 -f7580b36099a5f4f1d22d2de7634e388fac6474970914857919926e5a42548b9 -d1aa2499d32da8283d0a6916df317e50dec9976448c4d09f65a6f56ec07545ab -05b3175433ecdf6f8fdc14c3d88996599333fdaebaab30e04e3c78dab918f951 -43f892367bbbfb0e7481e985aa71e341111c2bbf85124b2b723f8afda8197fde -8c4261510027b28d02ddae8792776bf7baf368061921482d71cdfabdb3aaa071 -8aca71b2f429a414c8401077ee7a6507b8b06858dff5c69dfba29c23656e9d4f -c137709f70c6b22eff6403ea1e96213339291d5ebd2d77793ee18527ee0a459c -f1124f06afc732898df58930c03475560fedb6c3fb70b39a3d65224c91e8e665 -02ac903220e53ca67de5ef2b4cc3ac1d82ebf3a40acfeec8f275b9ef7296e644 -97a566a6a60d67bb45208895383bcc2efe8e9f35ca47fe1a335ab664657e3d54 -8ecb50e912050c9e4d003ed94f054da93a915fa488d166af6f744e89cca5bd3a -384947f2be6324333f5350f73768a492e68f16f9a62f52ad1ae616864d6ebe2f -0fa2c2adf8dcdef90b769583019ecd009d21bcec59d562b57928d93bf9806903 -949767770637111ca3011856926874759c28ec0425b48bd40e84ea8e7801fdb3 -7f95b2faab4d7646e484d1752ceaf5f234f20deb9e879216d4bae33d9e2fd780 -1030196f1a1c8ebe8d089ad5c0ede469410382f4342b1b3410c8f5bd31d918cd -923f0bf04865aedac4c04f68786fad31697069f89c000113759dc89f8e4a38e6 -2ed1ae1be51615057c59633ff818870b5e73a7077ece7f4af085f0e36d79de73 -44b13aec9694cf6419daa70f1221b72e42a6a17836404d32d0d91a49220f73c6 -94882e30af8cd2e515bb89b02dc8e39a1da81867aa6d24a7b20b0cecaefac406 -3b2b0b8b089367d2af0e115f00a1fd5953d7723de0e086 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark -%%EndResource -/F9_0 /ORLJZS+Sf-Kp-Medium-Extend_1125 1 1 -[ /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/E/.notdef/.notdef - /.notdef/.notdef/J/.notdef/.notdef/M/N/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/W - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef] -pdfMakeFont -%%EndSetup -pdfStartPage -%%EndPageSetup -[] 0 d -1 i -0 j -0 J -10 M -1 w -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -false op -false OP -{} settransfer -0 0 213 259 re -W -q -q -[1 0 0 1 0 0] cm -q -[1 0 0 1 0 0] cm -0 0 212.204 258.73 re -W -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -[1 0 0 1 0 0] Tm -0 0 Td --0.992 233.936 Td -/F9_0 36.8504 Tf -(W) -[38.508668 -0] Tj --4019 TJm -(N) -[29.406619 -0] Tj -87.04 127.004 Td -(M) -[34.455124 -0] Tj --2.835 42.487 Td -(E) -[22.920949 -0] Tj --4677 TJm -(J) -[22.589295 -0] Tj -[1 0 0 1 215.039 42.487] cm -q -/DeviceGray {} CS -[0] SC -/DeviceGray {} cs -[0] sc -0.3985 w -q -q -q -[1 0 0 1 -215.039 -42.487] cm -[1 0 0 1 0 0] cm -q -/DeviceGray {} CS -[0] SC -/DeviceGray {} cs -[0] sc -q -[0.10327 0 0 0.10327 0 0] cm -q -[1 0 0 1 0 0] cm -q -[1 0 0 1 0 0] cm -0 0 2054.771729 2386.010254 re -W -q -/DeviceRGB {} cs -[0 0 0] sc -330.316 6.233 m -334.938 9.663 347.703 19.096 358.691 27.194 c -378.664 41.917 l -389.891 41.42 l -408.512 40.592 497.566 38.647 556.715 37.772 c -628.621 36.709 798.469 35.252 798.91 35.694 c -800.105 36.889 802.234 77.827 803.133 116.834 c -804.164 161.686 803.176 211.795 799.5 301.362 c -798.848 317.202 798.316 332.229 798.316 334.764 c -798.316 339.37 l -828.316 339.557 l -817.117 340.584 l -770.867 344.834 680.566 359.881 617.516 373.846 c -563.023 385.917 512.832 399.491 455.516 417.667 c -390.383 438.319 354.051 451.846 324.758 466.35 c -308.641 474.331 306.344 476.522 301.051 488.967 c -296.23 500.303 287.062 519.053 281.641 528.67 c -279.41 532.627 277.352 537.319 277.066 539.092 c -275.785 547.116 280.664 559.147 291.914 575.678 c -307.371 598.397 320.02 612.858 359.516 652.959 c -375.797 669.491 393.234 687.506 398.262 692.991 c -403.293 698.479 414.832 710.709 423.902 720.167 c -448.684 746.018 558.664 861.167 585.117 888.963 c -597.875 902.374 615.348 920.729 623.941 929.756 c -632.535 938.784 655.566 963.088 675.125 983.768 c -794.254 1109.733 838.57 1154.307 880.336 1190.17 c -886.484 1195.452 892.117 1200.241 892.848 1200.811 c -894.035 1201.737 895.047 1200.385 902.137 1188.409 c -924.914 1149.944 929.652 1141.588 929.016 1141.014 c -928.633 1140.667 923.457 1137.209 917.516 1133.338 c -896.32 1119.51 874.637 1102.944 849.918 1081.686 c -829.883 1064.459 817.246 1052.713 775.117 1012.147 c -688.062 928.319 597.145 833.721 489.867 715.37 c -411.52 628.928 363.496 572.991 342.988 544.276 c -336.336 534.963 325.523 517.268 325.52 515.682 c -325.512 513.694 368.09 496.178 402.715 483.924 c -466.27 461.432 556.418 436.159 615.516 424.26 c -672.664 412.756 738.73 404.319 785.758 402.522 c -818.094 401.288 818.125 401.295 823.402 412.381 c -831.352 429.081 839.484 461.01 852.801 527.768 c -873.762 632.85 883.273 703.026 891.891 816.167 c -893.152 832.717 894.918 861.975 896.867 898.569 c -899.23 942.893 899.457 1020.44 897.301 1047.702 c -896.539 1057.342 896.02 1065.338 896.148 1065.467 c -896.5 1065.819 928.047 1022.542 929.465 1019.768 c -930.527 1017.682 930.691 1010.245 930.703 962.967 c -930.711 928.338 930.34 901.737 929.676 889.768 c -929.105 879.428 927.93 857.827 927.062 841.768 c -925.219 807.534 923.973 788.405 920.691 744.167 c -917.062 695.217 907.582 610.206 900.707 564.967 c -895.816 532.792 884.289 461.487 879.559 434.167 c -871.652 388.506 867.305 369.596 861.656 356.358 c -856.852 345.088 852.352 340.557 844.914 339.491 c -841.289 338.971 841.125 338.838 841.32 336.557 c -841.434 335.245 842.957 318.327 844.707 298.967 c -852.008 218.116 856.098 164.932 859.496 106.569 c -860.609 87.428 861.715 70.506 861.945 68.967 c -862.371 66.167 l -847.742 58.772 l -839.699 54.702 826.098 47.756 817.516 43.334 c -801.918 35.292 l -853.516 35.749 l -987.871 36.944 1129.449 41.967 1349.918 53.374 c -1394.961 55.702 1451.992 58.573 1492.316 60.542 c -1553.836 63.542 1585.926 65.588 1662.316 71.393 c -1702.906 74.479 1766.871 79.065 1785.918 80.26 c -1801.594 81.245 2055.703 82.088 2054.77 81.155 c -2054.516 80.901 2042.523 72.124 2028.113 61.647 c -2001.918 42.596 l -1899.117 42.573 l -1801.43 42.545 1754.445 41.975 1703.117 40.182 c -1681.598 39.432 1591.422 36.362 1538.715 34.584 c -1525.516 34.139 1500.496 33.413 1483.117 32.971 c -1445.473 32.014 1414.281 31.065 1350.316 28.936 c -1300.695 27.288 1278.191 26.514 1164.715 22.584 c -959.422 15.475 881.965 13.549 730.316 11.788 c -603.402 10.311 553.426 9.459 469.918 7.354 c -411.961 5.893 343.336 2.62 325.918 0.491 c -321.918 -0.001 l -330.316 6.233 l -h -319.477 484.241 m -318.773 485.604 317.996 486.514 317.75 486.268 c -317.289 485.807 319.629 481.768 320.355 481.768 c -320.578 481.768 320.184 482.881 319.477 484.241 c -h -1829.012 93.952 m -1794.832 154.815 1744.043 260.096 1714.418 331.491 c -1683.039 407.116 1672.402 435.502 1639.512 531.37 c -1606.48 627.655 1576.914 706.264 1555.113 755.768 c -1538.832 792.733 1509.949 860.002 1506.27 869.522 c -1505.668 871.081 1506.156 871.588 1510.754 874.159 c -1513.594 875.749 1515.918 877.17 1515.918 877.319 c -1515.918 877.467 1491.168 901.12 1460.918 929.877 c -1430.668 958.635 1402.676 985.252 1398.715 989.03 c -1394.758 992.803 1377.656 1008.995 1360.715 1025.006 c -1242.48 1136.772 1202.352 1177.038 1161.586 1224.811 c -1153.324 1238.932 1204.891 1260.135 1217.891 1265.62 c -1218.008 1265.483 1221.145 1260.686 1224.855 1254.963 c -1250.602 1215.284 1283.191 1176.823 1345.504 1112.569 c -1415.008 1040.897 1486.672 970.815 1558.859 903.92 c -1561.402 901.565 l -1564.152 903.268 l -1565.668 904.202 1567.082 904.967 1567.301 904.967 c -1567.516 904.967 1568.516 902.081 1569.52 898.557 c -1571.348 892.143 l -1598.633 867.112 l -1720.277 755.522 1794.438 691.647 1825.199 671.963 c -1833.352 666.749 1842.289 661.768 1843.496 661.768 c -1845.633 661.768 1862.59 702.846 1875.363 738.967 c -1897.82 802.479 1922.922 891.959 1934.723 950.569 c -1943.398 993.631 1950.699 1044.276 1955.145 1092.167 c -1956.402 1105.686 1957.414 1144.1 1956.645 1148.971 c -1956.281 1151.28 1955.336 1153.901 1954.551 1154.795 c -1952.492 1157.127 1940.223 1162.69 1929.516 1166.143 c -1908.527 1172.913 1851.34 1185.448 1785.516 1197.702 c -1689.129 1215.647 1593.805 1226.042 1465.918 1232.557 c -1402.309 1235.795 1351.719 1236.077 1314.016 1233.393 c -1303.953 1232.674 1295.262 1232.198 1294.699 1232.327 c -1294.141 1232.459 1303.918 1240.049 1316.434 1249.198 c -1339.184 1265.827 l -1359.75 1266.69 l -1382.039 1267.624 1440.691 1267.131 1465.918 1265.799 c -1474.277 1265.358 1488.676 1264.62 1497.918 1264.155 c -1581.012 1259.995 1660.418 1253.663 1719.117 1246.522 c -1738.305 1244.186 1786.648 1237.917 1792.715 1236.975 c -1876.25 1224.022 1938 1213.713 1965.676 1208.096 c -1998.301 1201.479 2013.664 1194.889 2018.48 1185.448 c -2020.043 1182.385 2020.113 1181.358 2019.621 1169.264 c -2018 1129.713 2001.844 1027.866 1985.438 953.768 c -1971.992 893.049 1958.668 844.608 1935.859 773.553 c -1916.953 714.647 1898.309 667.651 1886.32 648.667 c -1882.477 642.581 1880.688 641.362 1867.391 635.807 c -1858.879 632.252 1846.629 626.229 1829.117 616.987 c -1821.172 612.795 1821.078 612.768 1815.441 613.198 c -1806.355 613.885 1796.742 618.495 1780.316 630.045 c -1756.93 646.495 1743.145 658.811 1695.117 706.17 c -1683.016 718.104 1667.715 732.877 1661.117 739.006 c -1654.516 745.131 1640.918 758.03 1630.898 767.67 c -1620.875 777.307 1612.516 785.034 1612.32 784.838 c -1612.125 784.643 1614.676 777.663 1617.988 769.323 c -1637.922 719.186 1658.348 661.631 1693.926 555.37 c -1728.258 452.811 1741.656 416.413 1768.574 352.569 c -1802.82 271.338 1845.309 189.17 1882.074 133.069 c -1887.086 125.424 1891.078 119.084 1890.949 118.987 c -1890.762 118.838 1836.094 87.12 1834.168 86.045 c -1833.867 85.877 1831.547 89.436 1829.012 93.952 c -h -1876.027 655.413 m -1877.512 656.706 1877.574 656.881 1876.316 656.241 c -1873.602 654.85 1872.273 653.792 1873.227 653.78 c -1873.73 653.772 1874.988 654.506 1876.027 655.413 c -h -769.652 1212.37 m -767.188 1236.913 761.312 1249.456 750.082 1254.151 c -743.641 1256.842 730.66 1255.549 693.742 1248.542 c -651.137 1240.452 633.035 1237.538 629.086 1238.131 c -624.43 1238.831 620.488 1242.229 618.57 1247.206 c -616.289 1253.116 616.68 1267.655 619.426 1278.967 c -623.082 1294.022 628.551 1311.436 639.52 1342.967 c -647.523 1365.983 662.57 1410.752 665.867 1421.37 c -666.031 1421.901 651.301 1422.178 622.418 1422.186 c -580 1422.194 571.145 1422.475 508.715 1425.799 c -437.699 1429.577 375.242 1434.42 322.715 1440.225 c -291.98 1443.624 233.488 1451.198 212.188 1454.542 c -131.762 1467.167 66.758 1478.206 46.926 1482.616 c -28.918 1486.616 14.098 1491.784 8.039 1496.17 c -6.301 1497.428 3.855 1499.803 2.598 1501.448 c -0.484 1504.217 0.297 1505.049 0.043 1512.756 c --1.059 1546.178 19.508 1674.608 39.219 1757.37 c -54.238 1820.436 65.223 1859.018 88.07 1928.967 c -106.473 1985.307 127.934 2036.327 137.055 2045.42 c -138.5 2046.858 143.32 2049.502 148.715 2051.807 c -158.289 2055.901 179.465 2066.292 190.988 2072.545 c -196.777 2075.686 198.293 2076.167 202.414 2076.167 c -210.938 2076.167 220.145 2072.217 235.117 2062.143 c -259.547 2045.698 272.984 2033.768 328.316 1979.374 c -339.758 1968.127 354.332 1954.073 360.703 1948.147 c -367.074 1942.217 400.914 1909.999 435.902 1876.545 c -521.527 1794.678 591.523 1728.034 653.133 1669.713 c -681.281 1643.065 708.379 1617.362 713.34 1612.604 c -718.305 1607.842 722.504 1604.088 722.672 1604.256 c -723.965 1605.561 771.91 1777.967 784.715 1827.37 c -792.332 1856.745 798.293 1877.702 804.289 1896.198 c -810.066 1914.01 813.816 1927.143 821.508 1956.569 c -825.078 1970.209 831.969 1995.948 836.82 2013.768 c -841.676 2031.588 847.969 2055.709 850.801 2067.37 c -853.637 2079.026 856.852 2091.354 857.945 2094.76 c -862.496 2108.924 877.648 2129.225 889.207 2136.651 c -896.062 2141.053 902.461 2142.811 909.918 2142.342 c -920.18 2141.698 929.438 2137.542 943.117 2127.452 c -955.172 2118.553 962.371 2110.327 979.93 2085.37 c -992.277 2067.815 1005.125 2050.252 1023.816 2025.377 c -1039.777 2004.127 1049.824 1989.143 1067.359 1960.417 c -1086.371 1929.272 1097.129 1912.702 1110.117 1894.557 c -1121.516 1878.635 l -1121.609 1846.799 l -1121.66 1829.292 1121.969 1812.627 1122.289 1809.768 c -1122.848 1804.788 1122.879 1804.92 1122.996 1812.967 c -1123.066 1817.588 1123.477 1828.209 1123.91 1836.569 c -1124.344 1844.928 1125.078 1859.147 1125.539 1868.167 c -1132.117 1997.135 1141.66 2091.838 1159.113 2201.37 c -1170.18 2270.811 1179.785 2326.221 1183.406 2341.475 c -1189.41 2366.784 1195.188 2379.397 1202.82 2383.87 c -1206.473 2386.01 l -1220.594 2385.518 l -1260.723 2384.116 1371.742 2366.229 1445.516 2349.28 c -1492.309 2338.53 1540.844 2325.588 1577.117 2314.19 c -1652.043 2290.647 1681.578 2280.143 1716.922 2264.475 c -1728.707 2259.252 1741.031 2252.655 1744.746 2249.584 c -1747.09 2247.647 1749.262 2243.717 1753.48 2233.768 c -1758.277 2222.467 1763.367 2212.081 1770.832 2198.374 c -1776.746 2187.51 1777.457 2184.307 1775.578 2176.928 c -1773.641 2169.323 1770.238 2162.565 1762.711 2151.37 c -1746.996 2127.995 1732.785 2111.663 1693.117 2071.393 c -1676.398 2054.42 1658.758 2036.229 1653.918 2030.967 c -1649.078 2025.709 1625.312 2000.694 1601.113 1975.385 c -1486.953 1856.006 1445.086 1812.045 1368.316 1730.967 c -1308.078 1688.928 1184.141 1481.342 1141.617 1553.252 c -1131.883 1569.725 1123.918 1583.397 1123.918 1583.639 c -1123.918 1583.877 1129.699 1587.877 1136.766 1592.526 c -1176.129 1618.424 1207.242 1644.752 1271.91 1706.885 c -1354.113 1785.87 1429.703 1863.764 1524.727 1967.397 c -1631.949 2084.334 1691.473 2153.209 1714.504 2186.967 c -1721.379 2197.049 1728.133 2208.717 1727.754 2209.858 c -1727.359 2211.034 1712.039 2217.85 1691.117 2226.151 c -1632.727 2249.319 1563.332 2270.85 1482.203 2290.959 c -1433.008 2303.159 1382.348 2311.952 1323.516 2318.502 c -1294.469 2321.737 1279.082 2322.741 1256.715 2322.866 c -1233.969 2322.991 1234.875 2323.338 1229.887 2312.584 c -1220.41 2292.155 1209.816 2247.631 1192.387 2154.967 c -1172.277 2048.045 1160.48 1932.655 1155.051 1789.768 c -1153.898 1759.459 1154.531 1698.651 1156.23 1676.608 c -1157.316 1662.502 1157.367 1659.018 1156.473 1660.233 c -1140.887 1681.362 1124.938 1703.487 1124.145 1705.069 c -1123.355 1706.651 1122.969 1715.577 1122.578 1741.069 c -1122.059 1774.967 l -1108.719 1791.37 l -1074.309 1833.667 1048.707 1867.811 1028.418 1898.459 c -1023.863 1905.338 1012.043 1923.209 1002.148 1938.167 c -990.316 1956.061 975.016 1977.577 957.438 2001.049 c -942.742 2020.674 925.199 2044.198 918.457 2053.323 c -911.715 2062.448 906.051 2069.768 905.875 2069.592 c -905.52 2069.237 900.543 2051.842 892.312 2022.167 c -889.383 2011.608 883.422 1988.096 879.07 1969.917 c -870.188 1932.823 868.344 1926.288 862.105 1909.768 c -853.91 1888.077 846.355 1864.01 811.633 1748.967 c -800.121 1710.819 786.453 1664.518 775.984 1628.167 c -771.988 1614.307 766.43 1595.409 763.633 1586.167 c -758.539 1569.37 l -783.355 1544.569 l -797 1530.928 814.699 1512.725 822.68 1504.12 c -836.449 1489.268 861.68 1460.725 862.125 1459.495 c -862.238 1459.178 861.16 1458.245 859.723 1457.42 c -858.289 1456.596 845.027 1448.795 830.25 1440.088 c -815.473 1431.381 803.004 1424.147 802.547 1424.01 c -802.086 1423.877 797.398 1430.249 792.125 1438.167 c -786.855 1446.088 778.211 1458.327 772.914 1465.37 c -763.621 1477.729 741.207 1505.163 740.07 1505.565 c -739.766 1505.674 735.953 1493.616 731.594 1478.764 c -727.238 1463.917 719.449 1437.37 714.285 1419.768 c -709.121 1402.167 701.418 1376.448 697.172 1362.612 c -680.715 1308.999 678.309 1299.713 678.328 1289.897 c -678.344 1283.647 679.504 1280.893 682.582 1279.811 c -685.73 1278.702 699.777 1280.819 751.117 1290.147 c -770.855 1293.733 770.344 1293.655 779.918 1294.569 c -802.027 1296.674 813.906 1290.967 820.363 1275.131 c -821.926 1271.292 823.617 1265.905 824.117 1263.159 c -825.152 1257.491 825.336 1220.428 824.387 1209.569 c -823.773 1202.569 l -770.633 1202.569 l -769.652 1212.37 l -h -673 1454.276 m -676.703 1454.784 l -681.062 1468.475 l -683.457 1476.006 689.789 1496.155 695.137 1513.252 c -704.855 1544.334 l -702.586 1546.831 l -693.043 1557.338 657.582 1593.76 622.723 1628.862 c -549.34 1702.76 478.344 1770.264 381.516 1858.221 c -279.547 1950.846 220.691 2000.76 192.691 2018.362 c -184.852 2023.292 175.77 2028.288 175.371 2027.889 c -174.461 2026.979 162.91 1999.776 157.312 1985.37 c -135.766 1929.885 115.934 1866.01 96.703 1790.167 c -83.234 1737.053 74.23 1686.03 67.188 1622.967 c -63.992 1594.338 63.02 1579.463 62.855 1556.768 c -62.723 1538.975 62.809 1537.772 64.34 1535.635 c -67.547 1531.151 86.621 1523.358 107.035 1518.194 c -154.867 1506.092 249.438 1487.831 307.918 1479.409 c -388.488 1467.803 462.594 1461.096 565.312 1456.108 c -605.457 1454.163 664.789 1453.151 673 1454.276 c -h -147.918 2035.709 m -147.918 2036.413 144.977 2035.17 143.117 2033.678 c -141.184 2032.131 141.23 2032.131 144.516 2033.737 c -146.387 2034.651 147.918 2035.538 147.918 2035.709 c -h -930.641 2129.288 m -934.805 2131.022 933.961 2131.561 928.645 2130.557 c -925.781 2130.018 923.848 2129.135 922.934 2127.956 c -920.805 2125.202 921.238 2124.795 924.516 2126.459 c -926.168 2127.299 928.922 2128.573 930.641 2129.288 c -h -1735.918 2239.28 m -1735.918 2239.67 1735.172 2240.842 1734.258 2241.877 c -1732.602 2243.768 l -1734.031 2241.167 l -1735.516 2238.471 1735.918 2238.069 1735.918 2239.28 c -h -1319.629 1380.959 m -1320.008 1381.315 1332.348 1391.049 1347.051 1402.584 c -1372.375 1422.452 1374.133 1423.678 1380.316 1425.768 c -1394.25 1430.479 1404.422 1435.338 1410.973 1440.413 c -1414.488 1443.139 1418.004 1445.752 1418.785 1446.217 c -1420.125 1447.022 1420.098 1447.295 1418.305 1451.018 c -1415.73 1456.37 1402.004 1476.686 1395.637 1484.569 c -1390.957 1490.358 1378.977 1502.471 1363.316 1517.245 c -1360.125 1520.256 1357.516 1522.866 1357.516 1523.042 c -1357.516 1523.639 1451.504 1523.354 1452.363 1522.756 c -1454.246 1521.448 1462.523 1511.002 1469.828 1500.713 c -1486.5 1477.229 1486.105 1474.502 1463.516 1457.233 c -1457.961 1452.983 1441.484 1442.264 1431.516 1436.417 c -1402.434 1419.346 1357.918 1395.643 1343.094 1389.334 c -1335.93 1386.284 1318.789 1380.167 1319.629 1380.959 c -h -f -Q -Q -Q -Q -Q -[1 0 0 1 215.039 42.487] cm -Q -Q -Q -q -0.3985 w -Q -Q -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -Q -Q -Q -showpage -%%PageTrailer -pdfEndPage -%%Trailer -end -%%DocumentSuppliedResources: -%%+ font ORLJZS+Sf-Kp-Medium-Extend_1125 -%%EOF diff --git a/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo.eps b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo.eps deleted file mode 100644 index c124922decd..00000000000 --- a/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo.eps +++ /dev/null @@ -1,1033 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%Produced by poppler pdftops version: 0.74.0 (http://poppler.freedesktop.org) -%%Creator: TeX -%%LanguageLevel: 2 -%%DocumentSuppliedResources: (atend) -%%BoundingBox: 0 0 213 259 -%%HiResBoundingBox: 0 0 213 259 -%%DocumentSuppliedResources: (atend) -%%EndComments -%%BeginProlog -%%BeginResource: procset xpdf 3.00 0 -%%Copyright: Copyright 1996-2011 Glyph & Cog, LLC -/xpdf 75 dict def xpdf begin -% PDF special state -/pdfDictSize 15 def -/pdfSetup { - /setpagedevice where { - pop 2 dict begin - /Policies 1 dict dup begin /PageSize 6 def end def - { /Duplex true def } if - currentdict end setpagedevice - } { - pop - } ifelse -} def -/pdfSetupPaper { - % Change paper size, but only if different from previous paper size otherwise - % duplex fails. PLRM specifies a tolerance of 5 pts when matching paper size - % so we use the same when checking if the size changes. - /setpagedevice where { - pop currentpagedevice - /PageSize known { - 2 copy - currentpagedevice /PageSize get aload pop - exch 4 1 roll - sub abs 5 gt - 3 1 roll - sub abs 5 gt - or - } { - true - } ifelse - { - 2 array astore - 2 dict begin - /PageSize exch def - /ImagingBBox null def - currentdict end - setpagedevice - } { - pop pop - } ifelse - } { - pop - } ifelse -} def -/pdfStartPage { - pdfDictSize dict begin - /pdfFillCS [] def - /pdfFillXform {} def - /pdfStrokeCS [] def - /pdfStrokeXform {} def - /pdfFill [0] def - /pdfStroke [0] def - /pdfFillOP false def - /pdfStrokeOP false def - /pdfLastFill false def - /pdfLastStroke false def - /pdfTextMat [1 0 0 1 0 0] def - /pdfFontSize 0 def - /pdfCharSpacing 0 def - /pdfTextRender 0 def - /pdfPatternCS false def - /pdfTextRise 0 def - /pdfWordSpacing 0 def - /pdfHorizScaling 1 def - /pdfTextClipPath [] def -} def -/pdfEndPage { end } def -% PDF color state -/cs { /pdfFillXform exch def dup /pdfFillCS exch def - setcolorspace } def -/CS { /pdfStrokeXform exch def dup /pdfStrokeCS exch def - setcolorspace } def -/sc { pdfLastFill not { pdfFillCS setcolorspace } if - dup /pdfFill exch def aload pop pdfFillXform setcolor - /pdfLastFill true def /pdfLastStroke false def } def -/SC { pdfLastStroke not { pdfStrokeCS setcolorspace } if - dup /pdfStroke exch def aload pop pdfStrokeXform setcolor - /pdfLastStroke true def /pdfLastFill false def } def -/op { /pdfFillOP exch def - pdfLastFill { pdfFillOP setoverprint } if } def -/OP { /pdfStrokeOP exch def - pdfLastStroke { pdfStrokeOP setoverprint } if } def -/fCol { - pdfLastFill not { - pdfFillCS setcolorspace - pdfFill aload pop pdfFillXform setcolor - pdfFillOP setoverprint - /pdfLastFill true def /pdfLastStroke false def - } if -} def -/sCol { - pdfLastStroke not { - pdfStrokeCS setcolorspace - pdfStroke aload pop pdfStrokeXform setcolor - pdfStrokeOP setoverprint - /pdfLastStroke true def /pdfLastFill false def - } if -} def -% build a font -/pdfMakeFont { - 4 3 roll findfont - 4 2 roll matrix scale makefont - dup length dict begin - { 1 index /FID ne { def } { pop pop } ifelse } forall - /Encoding exch def - currentdict - end - definefont pop -} def -/pdfMakeFont16 { - exch findfont - dup length dict begin - { 1 index /FID ne { def } { pop pop } ifelse } forall - /WMode exch def - currentdict - end - definefont pop -} def -% graphics state operators -/q { gsave pdfDictSize dict begin } def -/Q { - end grestore - /pdfLastFill where { - pop - pdfLastFill { - pdfFillOP setoverprint - } { - pdfStrokeOP setoverprint - } ifelse - } if -} def -/cm { concat } def -/d { setdash } def -/i { setflat } def -/j { setlinejoin } def -/J { setlinecap } def -/M { setmiterlimit } def -/w { setlinewidth } def -% path segment operators -/m { moveto } def -/l { lineto } def -/c { curveto } def -/re { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto - neg 0 rlineto closepath } def -/h { closepath } def -% path painting operators -/S { sCol stroke } def -/Sf { fCol stroke } def -/f { fCol fill } def -/f* { fCol eofill } def -% clipping operators -/W { clip newpath } def -/W* { eoclip newpath } def -/Ws { strokepath clip newpath } def -% text state operators -/Tc { /pdfCharSpacing exch def } def -/Tf { dup /pdfFontSize exch def - dup pdfHorizScaling mul exch matrix scale - pdfTextMat matrix concatmatrix dup 4 0 put dup 5 0 put - exch findfont exch makefont setfont } def -/Tr { /pdfTextRender exch def } def -/Tp { /pdfPatternCS exch def } def -/Ts { /pdfTextRise exch def } def -/Tw { /pdfWordSpacing exch def } def -/Tz { /pdfHorizScaling exch def } def -% text positioning operators -/Td { pdfTextMat transform moveto } def -/Tm { /pdfTextMat exch def } def -% text string operators -/xyshow where { - pop - /xyshow2 { - dup length array - 0 2 2 index length 1 sub { - 2 index 1 index 2 copy get 3 1 roll 1 add get - pdfTextMat dtransform - 4 2 roll 2 copy 6 5 roll put 1 add 3 1 roll dup 4 2 roll put - } for - exch pop - xyshow - } def -}{ - /xyshow2 { - currentfont /FontType get 0 eq { - 0 2 3 index length 1 sub { - currentpoint 4 index 3 index 2 getinterval show moveto - 2 copy get 2 index 3 2 roll 1 add get - pdfTextMat dtransform rmoveto - } for - } { - 0 1 3 index length 1 sub { - currentpoint 4 index 3 index 1 getinterval show moveto - 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get - pdfTextMat dtransform rmoveto - } for - } ifelse - pop pop - } def -} ifelse -/cshow where { - pop - /xycp { - 0 3 2 roll - { - pop pop currentpoint 3 2 roll - 1 string dup 0 4 3 roll put false charpath moveto - 2 copy get 2 index 2 index 1 add get - pdfTextMat dtransform rmoveto - 2 add - } exch cshow - pop pop - } def -}{ - /xycp { - currentfont /FontType get 0 eq { - 0 2 3 index length 1 sub { - currentpoint 4 index 3 index 2 getinterval false charpath moveto - 2 copy get 2 index 3 2 roll 1 add get - pdfTextMat dtransform rmoveto - } for - } { - 0 1 3 index length 1 sub { - currentpoint 4 index 3 index 1 getinterval false charpath moveto - 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get - pdfTextMat dtransform rmoveto - } for - } ifelse - pop pop - } def -} ifelse -/Tj { - fCol - 0 pdfTextRise pdfTextMat dtransform rmoveto - currentpoint 4 2 roll - pdfTextRender 1 and 0 eq { - 2 copy xyshow2 - } if - pdfTextRender 3 and dup 1 eq exch 2 eq or { - 3 index 3 index moveto - 2 copy - currentfont /FontType get 3 eq { fCol } { sCol } ifelse - xycp currentpoint stroke moveto - } if - pdfTextRender 4 and 0 ne { - 4 2 roll moveto xycp - /pdfTextClipPath [ pdfTextClipPath aload pop - {/moveto cvx} - {/lineto cvx} - {/curveto cvx} - {/closepath cvx} - pathforall ] def - currentpoint newpath moveto - } { - pop pop pop pop - } ifelse - 0 pdfTextRise neg pdfTextMat dtransform rmoveto -} def -/TJm { 0.001 mul pdfFontSize mul pdfHorizScaling mul neg 0 - pdfTextMat dtransform rmoveto } def -/TJmV { 0.001 mul pdfFontSize mul neg 0 exch - pdfTextMat dtransform rmoveto } def -/Tclip { pdfTextClipPath cvx exec clip newpath - /pdfTextClipPath [] def } def -/Tclip* { pdfTextClipPath cvx exec eoclip newpath - /pdfTextClipPath [] def } def -% Level 2/3 image operators -/pdfImBuf 100 string def -/pdfImStr { - 2 copy exch length lt { - 2 copy get exch 1 add exch - } { - () - } ifelse -} def -/skipEOD { - { currentfile pdfImBuf readline - not { pop exit } if - (%-EOD-) eq { exit } if } loop -} def -/pdfIm { image skipEOD } def -/pdfImM { fCol imagemask skipEOD } def -/pr { 2 index 2 index 3 2 roll putinterval 4 add } def -/pdfImClip { - gsave - 0 2 4 index length 1 sub { - dup 4 index exch 2 copy - get 5 index div put - 1 add 3 index exch 2 copy - get 3 index div put - } for - pop pop rectclip -} def -/pdfImClipEnd { grestore } def -% shading operators -/colordelta { - false 0 1 3 index length 1 sub { - dup 4 index exch get 3 index 3 2 roll get sub abs 0.004 gt { - pop true - } if - } for - exch pop exch pop -} def -/funcCol { func n array astore } def -/funcSH { - dup 0 eq { - true - } { - dup 6 eq { - false - } { - 4 index 4 index funcCol dup - 6 index 4 index funcCol dup - 3 1 roll colordelta 3 1 roll - 5 index 5 index funcCol dup - 3 1 roll colordelta 3 1 roll - 6 index 8 index funcCol dup - 3 1 roll colordelta 3 1 roll - colordelta or or or - } ifelse - } ifelse - { - 1 add - 4 index 3 index add 0.5 mul exch 4 index 3 index add 0.5 mul exch - 6 index 6 index 4 index 4 index 4 index funcSH - 2 index 6 index 6 index 4 index 4 index funcSH - 6 index 2 index 4 index 6 index 4 index funcSH - 5 3 roll 3 2 roll funcSH pop pop - } { - pop 3 index 2 index add 0.5 mul 3 index 2 index add 0.5 mul - funcCol sc - dup 4 index exch mat transform m - 3 index 3 index mat transform l - 1 index 3 index mat transform l - mat transform l pop pop h f* - } ifelse -} def -/axialCol { - dup 0 lt { - pop t0 - } { - dup 1 gt { - pop t1 - } { - dt mul t0 add - } ifelse - } ifelse - func n array astore -} def -/axialSH { - dup 0 eq { - true - } { - dup 8 eq { - false - } { - 2 index axialCol 2 index axialCol colordelta - } ifelse - } ifelse - { - 1 add 3 1 roll 2 copy add 0.5 mul - dup 4 3 roll exch 4 index axialSH - exch 3 2 roll axialSH - } { - pop 2 copy add 0.5 mul - axialCol sc - exch dup dx mul x0 add exch dy mul y0 add - 3 2 roll dup dx mul x0 add exch dy mul y0 add - dx abs dy abs ge { - 2 copy yMin sub dy mul dx div add yMin m - yMax sub dy mul dx div add yMax l - 2 copy yMax sub dy mul dx div add yMax l - yMin sub dy mul dx div add yMin l - h f* - } { - exch 2 copy xMin sub dx mul dy div add xMin exch m - xMax sub dx mul dy div add xMax exch l - exch 2 copy xMax sub dx mul dy div add xMax exch l - xMin sub dx mul dy div add xMin exch l - h f* - } ifelse - } ifelse -} def -/radialCol { - dup t0 lt { - pop t0 - } { - dup t1 gt { - pop t1 - } if - } ifelse - func n array astore -} def -/radialSH { - dup 0 eq { - true - } { - dup 8 eq { - false - } { - 2 index dt mul t0 add radialCol - 2 index dt mul t0 add radialCol colordelta - } ifelse - } ifelse - { - 1 add 3 1 roll 2 copy add 0.5 mul - dup 4 3 roll exch 4 index radialSH - exch 3 2 roll radialSH - } { - pop 2 copy add 0.5 mul dt mul t0 add - radialCol sc - encl { - exch dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - 0 360 arc h - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - 360 0 arcn h f - } { - 2 copy - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a1 a2 arcn - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a2 a1 arcn h - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a1 a2 arc - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a2 a1 arc h f - } ifelse - } ifelse -} def -end -%%EndResource -%%EndProlog -%%BeginSetup -xpdf begin -%%BeginResource: font ORLJZS+Sf-Kp-Medium-Extend_1125 -%!PS-AdobeFont-1.0: Sf-Kp-Medium 001.000 -%%Title: Sf-Kp-Medium -%Version: 001.000 -%%CreationDate: Fri Apr 16 10:18:02 2010 -%%Creator: Christophe -%Copyright: Version 1.0 -% Generated by FontForge 20081224 (http://fontforge.sf.net/) -%%EndComments -10 dict begin -/FontType 1 def -/FontMatrix [0.001125 0 0 0.001 0 0 ]readonly def -/FontName /ORLJZS+Sf-Kp-Medium-Extend_1125 def -/FontBBox {-150 -243 1291 917 }readonly def -/PaintType 0 def -/FontInfo 9 dict dup begin -/version (001.000) readonly def -/Notice (Version 1.0) readonly def -/FullName (Sf-Kp-Medium) readonly def -/FamilyName (Sf-Kp) readonly def -/Weight (Medium) readonly def -/ItalicAngle 0 def -/isFixedPitch false def -/UnderlinePosition -133 def -/UnderlineThickness 20 def -end readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 69 /E put -dup 74 /J put -dup 77 /M put -dup 78 /N put -dup 87 /W put -readonly def -currentdict end -currentfile eexec -d9d66f633b846ab284bcf8b0411b772de5ce32340dc6f28af40857e4451976e7 -5182433cf9f333a38bd841c0d4e68bf9e012eb32a8ffb76b5816306b5edf7c99 -8b3a16d9b4bc056662e32c7cd0123dfaeb734c7532e64bbfbf5a60336e646716 -efb852c877f440d329172c71f1e5d59ce9473c26b8aef7ad68ef0727b6ec2e0c -02ce8d8b07183838330c0284bd419cbdae42b141d3d4be492473f240ceed931d -46e9f999c5cb3235e2c6daaa2c0169e1991beaea0d704bf49cea3e98e8c2361a -4b60d020d325e4c24518fb902882f4bc8481286273cc5090abeaaa92c0a19014 -0b0deba74531f5dedded2a3c33ed3d9bdb0cb9eb9c4475bc1c64758df399adb9 -df7260ad4c9f090b0ba4f2530bc4c0f6bcca606c9ce1829f203e58a8b8186b13 -910b37638d2d637c12d3c9a802475a1396402e309d94705fbdf7a68585771c25 -9ec121a078e82c9401044443def92f425545ae1f09bb674368ddb91d4c293c88 -f255fe9fae882f0c91bb9d2c594ef6306449d103ee5ed4f18f80ced7caad1402 -d1f14b37e371cc6d0ecb22b1e326ba3179178b767c002ecf1ce688436fe05613 -47882ee217002bc4a332eb8d7c41eec0751ef891d378fe0be7119a674bc7f026 -77b7cb5d870504638e37ff7bb0c06a9643bad2607416b62875cd4bad17052ef1 -11592fe433dfae88867ff7dd462e5ac8f4e330e04f1881824ca058c2022316b5 -b5a851e1c966dd3904413e9106db56d5ac8bc163b8b5963735590a40fa7b76f6 -9a4c6058842f3d7fee84786e8a68bde7f165b5967c6c25685b02cd76942fe281 -4d155111e1371b39b2c24ea48ddaf2e3fb915994b29b9fe8f26bf9f8655cdf91 -a7fae0f6b090734f6aba396f0c8359dd4dc01c0a11fc3eda722798fdc5ca5f2e -a7330b8b4fc157ca7a64daa0d6f227b94006558a8306086d396b7cc26e767ea7 -025ad6f34ccbf9c164b9366cad9d1f10c6ec98bc2fee9dfe1a9a759c56e85d1c -a98c737ca196de929d523dbdd461201dd3b1fadd98fca67bf664e5ef68792c2e -5e39057bd31bd973ce00b4771901f4b7adce6ebf74345ee67ed6757b856ddcc6 -2a1b02f43e91625582e140f3cd6854acf46d3db5cc080f6b923adecde192f62f -04dd31025fde751b43c995d4f08b0af5d380ec5fd36aa34e6c58f1ddf797cd0d -2503cb7c233f39e0b1bd0643ead066517b5e8c48f856ac3c116deff095fa948a -e70b608d931eeca7fdbeb1daac5bdc9a9e1034794fa2be1d6bf67b9cacf5bd77 -82454c6cb74f0a19756a00758df5407eb5ee7751e5e937bbe0776ed77fdae88d -33ac9465a5b10ab5094931cbfb95b6ab9bbdb38aaa27630a9b04301e65e6aad2 -64b266076725e147f311f15a3c5a1571e9cbb63fb2e908fdf71933a199594e1e -d61d28f3a9017780009ddead07135cbb70b81d3dd53483be7cfaa66508b35130 -6236464e9e509282cd12a5d63166addb5cb5befa7092b483c9a4f08a49b356db -2c444b2d79136c22c73a0eed657d7f91790777e7d8b1ebafb0e020685f5e2937 -c95b50d07c6316abc08495ef319006b45104e76e3846515c25c53dbf61fb3614 -b78ccf06c2e49cd8d7cf9fb27d90834aff6d3af0118fb8b37e5424bff39434e3 -f7580b36099a5f4f1d22d2de7634e388fac6474970914857919926e5a42548b9 -d1aa2499d32da8283d0a6916df317e50dec9976448c4d09f65a6f56ec07545ab -05b3175433ecdf6f8fdc14c3d88996599333fdaebaab30e04e3c78dab918f951 -43f892367bbbfb0e7481e985aa71e341111c2bbf85124b2b723f8afda8197fde -8c4261510027b28d02ddae8792776bf7baf368061921482d71cdfabdb3aaa071 -8aca71b2f429a414c8401077ee7a6507b8b06858dff5c69dfba29c23656e9d4f -c137709f70c6b22eff6403ea1e96213339291d5ebd2d77793ee18527ee0a459c -f1124f06afc732898df58930c03475560fedb6c3fb70b39a3d65224c91e8e665 -02ac903220e53ca67de5ef2b4cc3ac1d82ebf3a40acfeec8f275b9ef7296e644 -97a566a6a60d67bb45208895383bcc2efe8e9f35ca47fe1a335ab664657e3d54 -8ecb50e912050c9e4d003ed94f054da93a915fa488d166af6f744e89cca5bd3a -384947f2be6324333f5350f73768a492e68f16f9a62f52ad1ae616864d6ebe2f -0fa2c2adf8dcdef90b769583019ecd009d21bcec59d562b57928d93bf9806903 -949767770637111ca3011856926874759c28ec0425b48bd40e84ea8e7801fdb3 -7f95b2faab4d7646e484d1752ceaf5f234f20deb9e879216d4bae33d9e2fd780 -1030196f1a1c8ebe8d089ad5c0ede469410382f4342b1b3410c8f5bd31d918cd -923f0bf04865aedac4c04f68786fad31697069f89c000113759dc89f8e4a38e6 -2ed1ae1be51615057c59633ff818870b5e73a7077ece7f4af085f0e36d79de73 -44b13aec9694cf6419daa70f1221b72e42a6a17836404d32d0d91a49220f73c6 -94882e30af8cd2e515bb89b02dc8e39a1da81867aa6d24a7b20b0cecaefac406 -3b2b0b8b089367d2af0e115f00a1fd5953d7723de0e086 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark -%%EndResource -/F9_0 /ORLJZS+Sf-Kp-Medium-Extend_1125 1 1 -[ /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/E/.notdef/.notdef - /.notdef/.notdef/J/.notdef/.notdef/M/N/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/W - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef - /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef] -pdfMakeFont -%%EndSetup -pdfStartPage -%%EndPageSetup -[] 0 d -1 i -0 j -0 J -10 M -1 w -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -false op -false OP -{} settransfer -0 0 213 259 re -W -q -q -[1 0 0 1 0 0] cm -q -[1 0 0 1 0 0] cm -0 0 212.204 258.73 re -W -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -/DeviceRGB {} cs -[0 0 1] sc -/DeviceRGB {} CS -[0 0 1] SC -[1 0 0 1 0 0] Tm -0 0 Td --0.992 233.936 Td -/F9_0 36.8504 Tf -(W) -[38.508668 -0] Tj --4019 TJm -(N) -[29.406619 -0] Tj -87.04 127.004 Td -(M) -[34.455124 -0] Tj --2.835 42.487 Td -(E) -[22.920949 -0] Tj --4677 TJm -(J) -[22.589295 -0] Tj -[1 0 0 1 215.039 42.487] cm -q -/DeviceRGB {} CS -[0 0 1] SC -/DeviceRGB {} cs -[0 0 1] sc -0.3985 w -q -q -q -[1 0 0 1 -215.039 -42.487] cm -[1 0 0 1 0 0] cm -q -/DeviceRGB {} CS -[0 0 1] SC -/DeviceRGB {} cs -[0 0 1] sc -q -[0.10327 0 0 0.10327 0 0] cm -q -[1 0 0 1 0 0] cm -q -[1 0 0 1 0 0] cm -0 0 2054.771729 2386.010254 re -W -q -/DeviceRGB {} cs -[0 0 0] sc -330.316 6.233 m -334.938 9.663 347.703 19.096 358.691 27.194 c -378.664 41.917 l -389.891 41.42 l -408.512 40.592 497.566 38.647 556.715 37.772 c -628.621 36.709 798.469 35.252 798.91 35.694 c -800.105 36.889 802.234 77.827 803.133 116.834 c -804.164 161.686 803.176 211.795 799.5 301.362 c -798.848 317.202 798.316 332.229 798.316 334.764 c -798.316 339.37 l -828.316 339.557 l -817.117 340.584 l -770.867 344.834 680.566 359.881 617.516 373.846 c -563.023 385.917 512.832 399.491 455.516 417.667 c -390.383 438.319 354.051 451.846 324.758 466.35 c -308.641 474.331 306.344 476.522 301.051 488.967 c -296.23 500.303 287.062 519.053 281.641 528.67 c -279.41 532.627 277.352 537.319 277.066 539.092 c -275.785 547.116 280.664 559.147 291.914 575.678 c -307.371 598.397 320.02 612.858 359.516 652.959 c -375.797 669.491 393.234 687.506 398.262 692.991 c -403.293 698.479 414.832 710.709 423.902 720.167 c -448.684 746.018 558.664 861.167 585.117 888.963 c -597.875 902.374 615.348 920.729 623.941 929.756 c -632.535 938.784 655.566 963.088 675.125 983.768 c -794.254 1109.733 838.57 1154.307 880.336 1190.17 c -886.484 1195.452 892.117 1200.241 892.848 1200.811 c -894.035 1201.737 895.047 1200.385 902.137 1188.409 c -924.914 1149.944 929.652 1141.588 929.016 1141.014 c -928.633 1140.667 923.457 1137.209 917.516 1133.338 c -896.32 1119.51 874.637 1102.944 849.918 1081.686 c -829.883 1064.459 817.246 1052.713 775.117 1012.147 c -688.062 928.319 597.145 833.721 489.867 715.37 c -411.52 628.928 363.496 572.991 342.988 544.276 c -336.336 534.963 325.523 517.268 325.52 515.682 c -325.512 513.694 368.09 496.178 402.715 483.924 c -466.27 461.432 556.418 436.159 615.516 424.26 c -672.664 412.756 738.73 404.319 785.758 402.522 c -818.094 401.288 818.125 401.295 823.402 412.381 c -831.352 429.081 839.484 461.01 852.801 527.768 c -873.762 632.85 883.273 703.026 891.891 816.167 c -893.152 832.717 894.918 861.975 896.867 898.569 c -899.23 942.893 899.457 1020.44 897.301 1047.702 c -896.539 1057.342 896.02 1065.338 896.148 1065.467 c -896.5 1065.819 928.047 1022.542 929.465 1019.768 c -930.527 1017.682 930.691 1010.245 930.703 962.967 c -930.711 928.338 930.34 901.737 929.676 889.768 c -929.105 879.428 927.93 857.827 927.062 841.768 c -925.219 807.534 923.973 788.405 920.691 744.167 c -917.062 695.217 907.582 610.206 900.707 564.967 c -895.816 532.792 884.289 461.487 879.559 434.167 c -871.652 388.506 867.305 369.596 861.656 356.358 c -856.852 345.088 852.352 340.557 844.914 339.491 c -841.289 338.971 841.125 338.838 841.32 336.557 c -841.434 335.245 842.957 318.327 844.707 298.967 c -852.008 218.116 856.098 164.932 859.496 106.569 c -860.609 87.428 861.715 70.506 861.945 68.967 c -862.371 66.167 l -847.742 58.772 l -839.699 54.702 826.098 47.756 817.516 43.334 c -801.918 35.292 l -853.516 35.749 l -987.871 36.944 1129.449 41.967 1349.918 53.374 c -1394.961 55.702 1451.992 58.573 1492.316 60.542 c -1553.836 63.542 1585.926 65.588 1662.316 71.393 c -1702.906 74.479 1766.871 79.065 1785.918 80.26 c -1801.594 81.245 2055.703 82.088 2054.77 81.155 c -2054.516 80.901 2042.523 72.124 2028.113 61.647 c -2001.918 42.596 l -1899.117 42.573 l -1801.43 42.545 1754.445 41.975 1703.117 40.182 c -1681.598 39.432 1591.422 36.362 1538.715 34.584 c -1525.516 34.139 1500.496 33.413 1483.117 32.971 c -1445.473 32.014 1414.281 31.065 1350.316 28.936 c -1300.695 27.288 1278.191 26.514 1164.715 22.584 c -959.422 15.475 881.965 13.549 730.316 11.788 c -603.402 10.311 553.426 9.459 469.918 7.354 c -411.961 5.893 343.336 2.62 325.918 0.491 c -321.918 -0.001 l -330.316 6.233 l -h -319.477 484.241 m -318.773 485.604 317.996 486.514 317.75 486.268 c -317.289 485.807 319.629 481.768 320.355 481.768 c -320.578 481.768 320.184 482.881 319.477 484.241 c -h -1829.012 93.952 m -1794.832 154.815 1744.043 260.096 1714.418 331.491 c -1683.039 407.116 1672.402 435.502 1639.512 531.37 c -1606.48 627.655 1576.914 706.264 1555.113 755.768 c -1538.832 792.733 1509.949 860.002 1506.27 869.522 c -1505.668 871.081 1506.156 871.588 1510.754 874.159 c -1513.594 875.749 1515.918 877.17 1515.918 877.319 c -1515.918 877.467 1491.168 901.12 1460.918 929.877 c -1430.668 958.635 1402.676 985.252 1398.715 989.03 c -1394.758 992.803 1377.656 1008.995 1360.715 1025.006 c -1242.48 1136.772 1202.352 1177.038 1161.586 1224.811 c -1153.324 1238.932 1204.891 1260.135 1217.891 1265.62 c -1218.008 1265.483 1221.145 1260.686 1224.855 1254.963 c -1250.602 1215.284 1283.191 1176.823 1345.504 1112.569 c -1415.008 1040.897 1486.672 970.815 1558.859 903.92 c -1561.402 901.565 l -1564.152 903.268 l -1565.668 904.202 1567.082 904.967 1567.301 904.967 c -1567.516 904.967 1568.516 902.081 1569.52 898.557 c -1571.348 892.143 l -1598.633 867.112 l -1720.277 755.522 1794.438 691.647 1825.199 671.963 c -1833.352 666.749 1842.289 661.768 1843.496 661.768 c -1845.633 661.768 1862.59 702.846 1875.363 738.967 c -1897.82 802.479 1922.922 891.959 1934.723 950.569 c -1943.398 993.631 1950.699 1044.276 1955.145 1092.167 c -1956.402 1105.686 1957.414 1144.1 1956.645 1148.971 c -1956.281 1151.28 1955.336 1153.901 1954.551 1154.795 c -1952.492 1157.127 1940.223 1162.69 1929.516 1166.143 c -1908.527 1172.913 1851.34 1185.448 1785.516 1197.702 c -1689.129 1215.647 1593.805 1226.042 1465.918 1232.557 c -1402.309 1235.795 1351.719 1236.077 1314.016 1233.393 c -1303.953 1232.674 1295.262 1232.198 1294.699 1232.327 c -1294.141 1232.459 1303.918 1240.049 1316.434 1249.198 c -1339.184 1265.827 l -1359.75 1266.69 l -1382.039 1267.624 1440.691 1267.131 1465.918 1265.799 c -1474.277 1265.358 1488.676 1264.62 1497.918 1264.155 c -1581.012 1259.995 1660.418 1253.663 1719.117 1246.522 c -1738.305 1244.186 1786.648 1237.917 1792.715 1236.975 c -1876.25 1224.022 1938 1213.713 1965.676 1208.096 c -1998.301 1201.479 2013.664 1194.889 2018.48 1185.448 c -2020.043 1182.385 2020.113 1181.358 2019.621 1169.264 c -2018 1129.713 2001.844 1027.866 1985.438 953.768 c -1971.992 893.049 1958.668 844.608 1935.859 773.553 c -1916.953 714.647 1898.309 667.651 1886.32 648.667 c -1882.477 642.581 1880.688 641.362 1867.391 635.807 c -1858.879 632.252 1846.629 626.229 1829.117 616.987 c -1821.172 612.795 1821.078 612.768 1815.441 613.198 c -1806.355 613.885 1796.742 618.495 1780.316 630.045 c -1756.93 646.495 1743.145 658.811 1695.117 706.17 c -1683.016 718.104 1667.715 732.877 1661.117 739.006 c -1654.516 745.131 1640.918 758.03 1630.898 767.67 c -1620.875 777.307 1612.516 785.034 1612.32 784.838 c -1612.125 784.643 1614.676 777.663 1617.988 769.323 c -1637.922 719.186 1658.348 661.631 1693.926 555.37 c -1728.258 452.811 1741.656 416.413 1768.574 352.569 c -1802.82 271.338 1845.309 189.17 1882.074 133.069 c -1887.086 125.424 1891.078 119.084 1890.949 118.987 c -1890.762 118.838 1836.094 87.12 1834.168 86.045 c -1833.867 85.877 1831.547 89.436 1829.012 93.952 c -h -1876.027 655.413 m -1877.512 656.706 1877.574 656.881 1876.316 656.241 c -1873.602 654.85 1872.273 653.792 1873.227 653.78 c -1873.73 653.772 1874.988 654.506 1876.027 655.413 c -h -769.652 1212.37 m -767.188 1236.913 761.312 1249.456 750.082 1254.151 c -743.641 1256.842 730.66 1255.549 693.742 1248.542 c -651.137 1240.452 633.035 1237.538 629.086 1238.131 c -624.43 1238.831 620.488 1242.229 618.57 1247.206 c -616.289 1253.116 616.68 1267.655 619.426 1278.967 c -623.082 1294.022 628.551 1311.436 639.52 1342.967 c -647.523 1365.983 662.57 1410.752 665.867 1421.37 c -666.031 1421.901 651.301 1422.178 622.418 1422.186 c -580 1422.194 571.145 1422.475 508.715 1425.799 c -437.699 1429.577 375.242 1434.42 322.715 1440.225 c -291.98 1443.624 233.488 1451.198 212.188 1454.542 c -131.762 1467.167 66.758 1478.206 46.926 1482.616 c -28.918 1486.616 14.098 1491.784 8.039 1496.17 c -6.301 1497.428 3.855 1499.803 2.598 1501.448 c -0.484 1504.217 0.297 1505.049 0.043 1512.756 c --1.059 1546.178 19.508 1674.608 39.219 1757.37 c -54.238 1820.436 65.223 1859.018 88.07 1928.967 c -106.473 1985.307 127.934 2036.327 137.055 2045.42 c -138.5 2046.858 143.32 2049.502 148.715 2051.807 c -158.289 2055.901 179.465 2066.292 190.988 2072.545 c -196.777 2075.686 198.293 2076.167 202.414 2076.167 c -210.938 2076.167 220.145 2072.217 235.117 2062.143 c -259.547 2045.698 272.984 2033.768 328.316 1979.374 c -339.758 1968.127 354.332 1954.073 360.703 1948.147 c -367.074 1942.217 400.914 1909.999 435.902 1876.545 c -521.527 1794.678 591.523 1728.034 653.133 1669.713 c -681.281 1643.065 708.379 1617.362 713.34 1612.604 c -718.305 1607.842 722.504 1604.088 722.672 1604.256 c -723.965 1605.561 771.91 1777.967 784.715 1827.37 c -792.332 1856.745 798.293 1877.702 804.289 1896.198 c -810.066 1914.01 813.816 1927.143 821.508 1956.569 c -825.078 1970.209 831.969 1995.948 836.82 2013.768 c -841.676 2031.588 847.969 2055.709 850.801 2067.37 c -853.637 2079.026 856.852 2091.354 857.945 2094.76 c -862.496 2108.924 877.648 2129.225 889.207 2136.651 c -896.062 2141.053 902.461 2142.811 909.918 2142.342 c -920.18 2141.698 929.438 2137.542 943.117 2127.452 c -955.172 2118.553 962.371 2110.327 979.93 2085.37 c -992.277 2067.815 1005.125 2050.252 1023.816 2025.377 c -1039.777 2004.127 1049.824 1989.143 1067.359 1960.417 c -1086.371 1929.272 1097.129 1912.702 1110.117 1894.557 c -1121.516 1878.635 l -1121.609 1846.799 l -1121.66 1829.292 1121.969 1812.627 1122.289 1809.768 c -1122.848 1804.788 1122.879 1804.92 1122.996 1812.967 c -1123.066 1817.588 1123.477 1828.209 1123.91 1836.569 c -1124.344 1844.928 1125.078 1859.147 1125.539 1868.167 c -1132.117 1997.135 1141.66 2091.838 1159.113 2201.37 c -1170.18 2270.811 1179.785 2326.221 1183.406 2341.475 c -1189.41 2366.784 1195.188 2379.397 1202.82 2383.87 c -1206.473 2386.01 l -1220.594 2385.518 l -1260.723 2384.116 1371.742 2366.229 1445.516 2349.28 c -1492.309 2338.53 1540.844 2325.588 1577.117 2314.19 c -1652.043 2290.647 1681.578 2280.143 1716.922 2264.475 c -1728.707 2259.252 1741.031 2252.655 1744.746 2249.584 c -1747.09 2247.647 1749.262 2243.717 1753.48 2233.768 c -1758.277 2222.467 1763.367 2212.081 1770.832 2198.374 c -1776.746 2187.51 1777.457 2184.307 1775.578 2176.928 c -1773.641 2169.323 1770.238 2162.565 1762.711 2151.37 c -1746.996 2127.995 1732.785 2111.663 1693.117 2071.393 c -1676.398 2054.42 1658.758 2036.229 1653.918 2030.967 c -1649.078 2025.709 1625.312 2000.694 1601.113 1975.385 c -1486.953 1856.006 1445.086 1812.045 1368.316 1730.967 c -1308.078 1688.928 1184.141 1481.342 1141.617 1553.252 c -1131.883 1569.725 1123.918 1583.397 1123.918 1583.639 c -1123.918 1583.877 1129.699 1587.877 1136.766 1592.526 c -1176.129 1618.424 1207.242 1644.752 1271.91 1706.885 c -1354.113 1785.87 1429.703 1863.764 1524.727 1967.397 c -1631.949 2084.334 1691.473 2153.209 1714.504 2186.967 c -1721.379 2197.049 1728.133 2208.717 1727.754 2209.858 c -1727.359 2211.034 1712.039 2217.85 1691.117 2226.151 c -1632.727 2249.319 1563.332 2270.85 1482.203 2290.959 c -1433.008 2303.159 1382.348 2311.952 1323.516 2318.502 c -1294.469 2321.737 1279.082 2322.741 1256.715 2322.866 c -1233.969 2322.991 1234.875 2323.338 1229.887 2312.584 c -1220.41 2292.155 1209.816 2247.631 1192.387 2154.967 c -1172.277 2048.045 1160.48 1932.655 1155.051 1789.768 c -1153.898 1759.459 1154.531 1698.651 1156.23 1676.608 c -1157.316 1662.502 1157.367 1659.018 1156.473 1660.233 c -1140.887 1681.362 1124.938 1703.487 1124.145 1705.069 c -1123.355 1706.651 1122.969 1715.577 1122.578 1741.069 c -1122.059 1774.967 l -1108.719 1791.37 l -1074.309 1833.667 1048.707 1867.811 1028.418 1898.459 c -1023.863 1905.338 1012.043 1923.209 1002.148 1938.167 c -990.316 1956.061 975.016 1977.577 957.438 2001.049 c -942.742 2020.674 925.199 2044.198 918.457 2053.323 c -911.715 2062.448 906.051 2069.768 905.875 2069.592 c -905.52 2069.237 900.543 2051.842 892.312 2022.167 c -889.383 2011.608 883.422 1988.096 879.07 1969.917 c -870.188 1932.823 868.344 1926.288 862.105 1909.768 c -853.91 1888.077 846.355 1864.01 811.633 1748.967 c -800.121 1710.819 786.453 1664.518 775.984 1628.167 c -771.988 1614.307 766.43 1595.409 763.633 1586.167 c -758.539 1569.37 l -783.355 1544.569 l -797 1530.928 814.699 1512.725 822.68 1504.12 c -836.449 1489.268 861.68 1460.725 862.125 1459.495 c -862.238 1459.178 861.16 1458.245 859.723 1457.42 c -858.289 1456.596 845.027 1448.795 830.25 1440.088 c -815.473 1431.381 803.004 1424.147 802.547 1424.01 c -802.086 1423.877 797.398 1430.249 792.125 1438.167 c -786.855 1446.088 778.211 1458.327 772.914 1465.37 c -763.621 1477.729 741.207 1505.163 740.07 1505.565 c -739.766 1505.674 735.953 1493.616 731.594 1478.764 c -727.238 1463.917 719.449 1437.37 714.285 1419.768 c -709.121 1402.167 701.418 1376.448 697.172 1362.612 c -680.715 1308.999 678.309 1299.713 678.328 1289.897 c -678.344 1283.647 679.504 1280.893 682.582 1279.811 c -685.73 1278.702 699.777 1280.819 751.117 1290.147 c -770.855 1293.733 770.344 1293.655 779.918 1294.569 c -802.027 1296.674 813.906 1290.967 820.363 1275.131 c -821.926 1271.292 823.617 1265.905 824.117 1263.159 c -825.152 1257.491 825.336 1220.428 824.387 1209.569 c -823.773 1202.569 l -770.633 1202.569 l -769.652 1212.37 l -h -673 1454.276 m -676.703 1454.784 l -681.062 1468.475 l -683.457 1476.006 689.789 1496.155 695.137 1513.252 c -704.855 1544.334 l -702.586 1546.831 l -693.043 1557.338 657.582 1593.76 622.723 1628.862 c -549.34 1702.76 478.344 1770.264 381.516 1858.221 c -279.547 1950.846 220.691 2000.76 192.691 2018.362 c -184.852 2023.292 175.77 2028.288 175.371 2027.889 c -174.461 2026.979 162.91 1999.776 157.312 1985.37 c -135.766 1929.885 115.934 1866.01 96.703 1790.167 c -83.234 1737.053 74.23 1686.03 67.188 1622.967 c -63.992 1594.338 63.02 1579.463 62.855 1556.768 c -62.723 1538.975 62.809 1537.772 64.34 1535.635 c -67.547 1531.151 86.621 1523.358 107.035 1518.194 c -154.867 1506.092 249.438 1487.831 307.918 1479.409 c -388.488 1467.803 462.594 1461.096 565.312 1456.108 c -605.457 1454.163 664.789 1453.151 673 1454.276 c -h -147.918 2035.709 m -147.918 2036.413 144.977 2035.17 143.117 2033.678 c -141.184 2032.131 141.23 2032.131 144.516 2033.737 c -146.387 2034.651 147.918 2035.538 147.918 2035.709 c -h -930.641 2129.288 m -934.805 2131.022 933.961 2131.561 928.645 2130.557 c -925.781 2130.018 923.848 2129.135 922.934 2127.956 c -920.805 2125.202 921.238 2124.795 924.516 2126.459 c -926.168 2127.299 928.922 2128.573 930.641 2129.288 c -h -1735.918 2239.28 m -1735.918 2239.67 1735.172 2240.842 1734.258 2241.877 c -1732.602 2243.768 l -1734.031 2241.167 l -1735.516 2238.471 1735.918 2238.069 1735.918 2239.28 c -h -1319.629 1380.959 m -1320.008 1381.315 1332.348 1391.049 1347.051 1402.584 c -1372.375 1422.452 1374.133 1423.678 1380.316 1425.768 c -1394.25 1430.479 1404.422 1435.338 1410.973 1440.413 c -1414.488 1443.139 1418.004 1445.752 1418.785 1446.217 c -1420.125 1447.022 1420.098 1447.295 1418.305 1451.018 c -1415.73 1456.37 1402.004 1476.686 1395.637 1484.569 c -1390.957 1490.358 1378.977 1502.471 1363.316 1517.245 c -1360.125 1520.256 1357.516 1522.866 1357.516 1523.042 c -1357.516 1523.639 1451.504 1523.354 1452.363 1522.756 c -1454.246 1521.448 1462.523 1511.002 1469.828 1500.713 c -1486.5 1477.229 1486.105 1474.502 1463.516 1457.233 c -1457.961 1452.983 1441.484 1442.264 1431.516 1436.417 c -1402.434 1419.346 1357.918 1395.643 1343.094 1389.334 c -1335.93 1386.284 1318.789 1380.167 1319.629 1380.959 c -h -f -Q -Q -Q -Q -Q -[1 0 0 1 215.039 42.487] cm -Q -Q -Q -q -0.3985 w -Q -Q -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -/DeviceRGB {} cs -[0 0 1] sc -/DeviceRGB {} CS -[0 0 1] SC -Q -Q -Q -showpage -%%PageTrailer -pdfEndPage -%%Trailer -end -%%DocumentSuppliedResources: -%%+ font ORLJZS+Sf-Kp-Medium-Extend_1125 -%%EOF diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx index 6866f29678f..d3a862eb4d8 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx @@ -96,7 +96,7 @@ \renewcommand*\bibnamedelimd{\addnbspace} \DeclareFieldFormat{journaltitle}{\mkbibemph{#1\isdot}} %% -%% Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +%% Copyright (C) 2015-2021 by Denis Bitouze <denis.bitouze@univ-littoral.fr> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx index 13a85c8771e..8761aa2d49d 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx @@ -145,7 +145,7 @@ % {\usebibmacro{textcite:postnote}} \ExecuteBibliographyOptions{autocite=nwejmfootcite} %% -%% Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +%% Copyright (C) 2015-2021 by Denis Bitouze <denis.bitouze@univ-littoral.fr> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.cls b/Master/texmf-dist/tex/latex/nwejm/nwejm.cls index eda00b36d18..e38b999a92a 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cls +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cls @@ -18,8 +18,8 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesExplClass {nwejm} - {2020-03-18} - {1.0.1} + {2021-10-12} + {1.0.2} { Class for the journal "North-Western European Journal of Mathematics". } @@ -64,8 +64,8 @@ can~be~used~only~in~document~body~and~not~in~preamble!}% \msg_new:nnn{nwejmart}{Article~setup~not~consistent}{The~ article~ setup~ concerning~ the~ option~ `#1'~ has~ changed~ after~ its~ 1st~ use.~ Please~ - use~ \articlesetup~ command~ just~ once,~ just~ after~ the~ beginning~ of~ - the~ document.}% + use~ `\string\articlesetup'~ command~ just~ once,~ just~ after~ the~ + beginning~ of~ the~ document.}% \msg_new:nnn{ nwejm }{`xy'~package~not~allowed!}{The~ `xy'~ package~ is~ not~ allowed~ with~ the~ @@ -117,7 +117,7 @@ \PassOptionsToPackage{export}{adjustbox}% \PassOptionsToPackage{fleqn}{amsmath}% \PassOptionsToPackage{french,ngerman,dutch,english,noabbrev,capitalize}{cleveref} -\AtBeginDocument{ +\AddToHook{begindocument/before}{ \LoadDictionaryFor{french}{nwejm} \LoadDictionaryFor{english}{nwejm} \LoadDictionaryFor{dutch}{nwejm} @@ -127,13 +127,14 @@ \PassOptionsToPackage{french,ngerman,dutch,english}{varioref} \RequirePackage[l2tabu,orthodox]{nag} \sys_if_engine_pdftex:TF - { - \RequirePackage[utf8]{inputenc} - }{ - \RequirePackage{fontspec} - \DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\ } - } -\RequirePackage[T1]{fontenc} +{ + \RequirePackage[T1]{fontenc} + \RequirePackage[easyscsl,noDcommand]{kpfonts} +}{ + \RequirePackage{unicode-math} + \RequirePackage[noDcommand]{kpfonts-otf} + \setmonofont[Scale = MatchLowercase]{Latin Modern Mono} +} \RequirePackage[pagestyles]{titlesec}% \RequirePackage{graphicx}% \RequirePackage{adjustbox}% @@ -151,9 +152,7 @@ \RequirePackage{booktabs} \RequirePackage{mathtools} \RequirePackage[amsmath,thmmarks,fleqn]{ntheorem} -\RequirePackage{rsfso} \RequirePackage{esvect} -\RequirePackage[easyscsl,noDcommand]{kpfonts} \RequirePackage{geometry} \RequirePackage{translations}% \RequirePackage{currfile} @@ -206,7 +205,7 @@ \RequirePackage[backend=biber,style=nwejm]{biblatex}% \ExecuteBibliographyOptions{defernumbers=true,dashed=false,uniquename=init,backref,safeinputenc} \RequirePackage[pdfencoding=unicode,final]{hyperref}% -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% \RequirePackage[all]{hypcap} @@ -641,7 +640,7 @@ } \box_new:N \l__nwejm_journal_logo_box \box_new:N \l__nwejm_journal_name_box - \AfterEndPreamble{% + \AddToHook{begindocument/end}{% \hbox_set:Nn \l__nwejm_journal_name_box { \bfseries% @@ -687,7 +686,7 @@ {}% } \def\@pnumwidth{\@tocrmarg} -\AtBeginDocument{% +\AddToHook{begindocument}{% \graphicspath{{\c__nwejm_issue_images_path_string_tl//}{../\c__nwejm_issue_images_path_string_tl//}} % \glsdisablehyper } @@ -1248,10 +1247,10 @@ rectangle (current~page.south~east); % laboratory logo \node[anchor=south~east] at ([xshift=-10mm]current~page~text~area.south~east) - {\includegraphics[height=.66\c__nwejm_logos_rectangle_height_dim]{logo-painleve}} ; + {\includegraphics[height=.5\c__nwejm_logos_rectangle_height_dim]{logo-painleve}} ; % university logo \node[anchor=south~west] at (current~page~text~area.south~west) - {\includegraphics[height=.66\c__nwejm_logos_rectangle_height_dim]{logo-ul1-ufr-math}} ; + {\includegraphics[height=.5\c__nwejm_logos_rectangle_height_dim]{ul-fst-math}} ; % crop marks \draw [white] ([xshift=2.5mm]current~page~text~area.north~east) -- @@ -1564,6 +1563,7 @@ \crefname{line}{ligne}{lignes}% } \NewDocumentCommand \inputarticle { O{english} m } {% + \int_gincr:N \g__nwejm_articles_int \newrefsection \renewcommand*{\glspluralsuffix}{s} \renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} @@ -1572,6 +1572,7 @@ \str_case:nn {#1} { {english} { \selectlanguage{english} + % \shorthandoff{"}% \renewcommand*{\glossaryname}{Glossary}% \renewcommand*{\acronymname}{Acronyms}% \renewcommand*{\entryname}{Notation}% @@ -1583,6 +1584,7 @@ } {german} { \selectlanguage{ngerman} + % \shorthandon{"}% \renewcommand*{\glossaryname}{Glossar}% \renewcommand*{\acronymname}{Akronyme}% \renewcommand*{\entryname}{Bezeichnung}% @@ -1594,6 +1596,7 @@ } {ngerman} { \selectlanguage{ngerman} + % \shorthandon{"}% \renewcommand*{\glossaryname}{Glossar}% \renewcommand*{\acronymname}{Akronyme}% \renewcommand*{\entryname}{Bezeichnung}% @@ -1605,6 +1608,7 @@ } {french} { \selectlanguage{french} + % \shorthandoff{"}% \FrenchFootnotes \g__nwejm_french_crefname_tl \renewcommand*{\glossaryname}{Glossaire}% @@ -1621,6 +1625,7 @@ } {dutch} { \selectlanguage{dutch} + % \shorthandon{"}% \renewcommand*{\glossaryname}{Woordenlijst}% \renewcommand*{\acronymname}{Acroniemen}% \renewcommand*{\entryname}{Benaming}% @@ -1648,10 +1653,11 @@ \setcounter{##1}{\c_zero_int} } } + \gdef\thesection{\@arabic\c@section} \glsresetall \selectlanguage{english} } -\AtBeginDocument{% +\AddToHook{begindocument}{% \tl_new:N \g__nwejm_bib_issue_date_tl \tl_gset:Nn \g__nwejm_bib_issue_date_tl { @@ -1675,7 +1681,6 @@ \tl_new:N \g__nwejm_title_tl \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 @@ -2012,7 +2017,7 @@ \tl_gclear:N \g__nwejm_people_email_tl \tl_clear:N \l__nwejm_people_first_last_names_tl% } -\AtEndPreamble{\file_input:n {\c__nwejm_configuration_file_string_tl}} +\AddToHook{begindocument/before}{\file_input:n {\c__nwejm_configuration_file_string_tl}} \DeclarePlainStyle{«~}{~»}{`}{'} \setcounter{topnumber}{3} \renewcommand{\topfraction}{0.8} @@ -2270,7 +2275,7 @@ \cs_generate_variant:Nn \__nwejm_new_theorem:nnnnnnnnn { nVVVVVVVV } \RenewDocumentCommand \newtheorem { O{} m } { - \AtBeginDocument{ + \AddToHook{begindocument}{ \tl_clear:N \l__nwejm_newtheorem_style_tl \tl_clear:N \l__nwejm_newtheorem_title_tl \tl_clear:N \l__nwejm_newtheorem_french_title_tl @@ -2476,7 +2481,7 @@ } } } -\AfterEndPreamble{ +\AddToHook{begindocument/end}{ \ifcurrentbaselanguage{french}{\g__nwejm_french_crefname_tl}{} } \clist_set:Nn \l_tmpa_clist {% @@ -2991,7 +2996,7 @@ left=<, right=> } -\AtEndPreamble{\allowdisplaybreaks} +\AddToHook{begindocument/before}{\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 @@ -3278,7 +3283,7 @@ }{ } } -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \defbibheading{__nwejm_subbibliography}[\refname]{% \section*{#1} }% @@ -3296,13 +3301,16 @@ \__nwejm_printbibliography[heading=__nwejm_subbibliography,resetnumbers,#1] } \exp_after:wN\addbibresource\exp_after:wN{\c__nwejm_issue_bib_path_string_tl} -\ifkp@easyscsl -\DeclareRobustCommand{\itshape}{\not@math@alphabet\itshape\mathit% - \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% - \fontshape\itdefault}\selectfont} -\fi -\DeclareMathAlphabet\mathfrak{U}{euf}{m}{n} -\SetMathAlphabet\mathfrak{bold}{U}{euf}{b}{n} +\sys_if_engine_pdftex:T +{ + \ifkp@easyscsl + \DeclareRobustCommand{\itshape}{\not@math@alphabet\itshape\mathit% + \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% + \fontshape\itdefault}\selectfont} + \fi + \DeclareMathAlphabet\mathfrak{U}{euf}{m}{n} + \SetMathAlphabet\mathfrak{bold}{U}{euf}{b}{n} +} \expandafter\def\expandafter\pdfstringdefPreHook \expandafter{% \pdfstringdefPreHook @@ -3346,7 +3354,7 @@ } \xspace } -\AfterEndPreamble{% +\AddToHook{begindocument/end}{% \bool_if:NTF {\g__nwejm_cover_bool} { \g__nwejm_display_frontcover_tl \g__nwejm_display_backcover_tl @@ -3357,12 +3365,12 @@ \tableofcontents } } -\AfterEndPreamble{% +\AddToHook{begindocument/end}{% \titleformat{\chapter}[block] {\normalfont\centering}{}{0pt}{} \titlespacing*{\chapter}{0pt}{0pt}{0pt} } -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \@ifpackageloaded{xy}{% \msg_error:nn{ nwejm @@ -3372,7 +3380,7 @@ } \ExplSyntaxOff %% -%% Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +%% Copyright (C) 2015-2021 by Denis Bitouze <denis.bitouze@univ-littoral.fr> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx index 6ad76a5683b..70c2bfed4f4 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx @@ -13,7 +13,7 @@ %% See:| http://www.latex-project.org/lppl.txt %% %% -%% Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +%% Copyright (C) 2015-2021 by Denis Bitouze <denis.bitouze@univ-littoral.fr> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx index 5c60fe65557..b2358d072bd 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx @@ -21,7 +21,7 @@ volumes = {{volumes}{vol\adddot}}, } %% -%% Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +%% Copyright (C) 2015-2021 by Denis Bitouze <denis.bitouze@univ-littoral.fr> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls index 5f7b8b05a9c..a6af4df3c32 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} - {2020-03-18} - {1.0.1} + {2021-10-12} + {1.0.2} { Class for the journal "North-Western European Journal of Mathematics". } @@ -64,8 +64,8 @@ can~be~used~only~in~document~body~and~not~in~preamble!}% \msg_new:nnn{nwejmart}{Article~setup~not~consistent}{The~ article~ setup~ concerning~ the~ option~ `#1'~ has~ changed~ after~ its~ 1st~ use.~ Please~ - use~ \articlesetup~ command~ just~ once,~ just~ after~ the~ beginning~ of~ - the~ document.}% + use~ `\string\articlesetup'~ command~ just~ once,~ just~ after~ the~ + beginning~ of~ the~ document.}% \msg_new:nnn{ nwejmart }{`xy'~package~not~allowed!}{The~ `xy'~ package~ is~ not~ allowed~ with~ the~ @@ -81,13 +81,11 @@ \bool_gset_true:N \g__nwejm_language_specified_bool% \PassOptionsToPackage{main=#1}{babel} \PassOptionsToPackage{#1}{varioref} - \AtBeginDocument{ + \AddToHook{begindocument/before}{% \LoadDictionaryFor{#1}{nwejm} - } - \AtEndPreamble{% \FCloadlang{#1} } - \AfterEndPreamble{% + \AddToHook{begindocument/end}{% \selectlanguage{#1} } } @@ -139,13 +137,14 @@ } \RequirePackage[l2tabu,orthodox]{nag} \sys_if_engine_pdftex:TF - { - \RequirePackage[utf8]{inputenc} - }{ - \RequirePackage{fontspec} - \DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\ } - } -\RequirePackage[T1]{fontenc} +{ + \RequirePackage[T1]{fontenc} + \RequirePackage[easyscsl,noDcommand]{kpfonts} +}{ + \RequirePackage{unicode-math} + \RequirePackage[noDcommand]{kpfonts-otf} + \setmonofont[Scale = MatchLowercase]{Latin Modern Mono} +} \RequirePackage[pagestyles]{titlesec}% \RequirePackage{graphicx}% \RequirePackage{adjustbox}% @@ -163,9 +162,7 @@ \RequirePackage{booktabs} \RequirePackage{mathtools} \RequirePackage[amsmath,thmmarks,fleqn]{ntheorem} -\RequirePackage{rsfso} \RequirePackage{esvect} -\RequirePackage[easyscsl,noDcommand]{kpfonts} \RequirePackage{geometry} \RequirePackage{translations}% \RequirePackage{currfile} @@ -183,7 +180,7 @@ \RequirePackage[backend=biber,style=nwejm]{biblatex}% \ExecuteBibliographyOptions{defernumbers=true,dashed=false,uniquename=init,backref,safeinputenc} \RequirePackage[pdfencoding=unicode,final]{hyperref}% -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% \RequirePackage[all]{hypcap} @@ -358,7 +355,7 @@ } \box_new:N \l__nwejm_journal_logo_box \box_new:N \l__nwejm_journal_name_box - \AfterEndPreamble{% + \AddToHook{begindocument/end}{% \hbox_set:Nn \l__nwejm_journal_name_box { \bfseries% @@ -404,11 +401,11 @@ {}% } \def\@pnumwidth{\@tocrmarg} -\AtBeginDocument{% +\AddToHook{begindocument}{% \graphicspath{{\c__nwejm_issue_images_path_string_tl//}{../\c__nwejm_issue_images_path_string_tl//}} % \glsdisablehyper } - \AfterEndPreamble{\g__nwejm_mainmatter_switch_tl} + \AddToHook{begindocument/end}{\g__nwejm_mainmatter_switch_tl} \int_new:N \g__nwejm_issue_number_int \int_new:N \g__nwejm_issue_month_int \int_new:N \g__nwejm_issue_year_int @@ -622,7 +619,7 @@ \file_if_exist:nT { \c__nwejm_main_file_name_tl.aux } {\externaldocument[__nwejm-]{\c__nwejm_main_file_name_tl} - \AfterEndPreamble{\setcounter{page}{\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}} + \AddToHook{begindocument/end}{\setcounter{page}{\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}} } \NewDocumentCommand \fixpagenumber { m } { \setcounter{page}{#1} @@ -737,92 +734,7 @@ \crefname{listing}{liste}{listes}% \crefname{line}{ligne}{lignes}% } -\NewDocumentCommand \inputarticle { O{english} m } {% - \newrefsection - \renewcommand*{\glspluralsuffix}{s} - \renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} - \renewcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}} - \StandardFootnotes - \str_case:nn {#1} { - {english} { - \selectlanguage{english} - \renewcommand*{\glossaryname}{Glossary}% - \renewcommand*{\acronymname}{Acronyms}% - \renewcommand*{\entryname}{Notation}% - \renewcommand*{\descriptionname}{Description}% - \renewcommand*{\symbolname}{Symbol}% - \renewcommand*{\pagelistname}{Page List}% - \renewcommand*{\glssymbolsgroupname}{Symbols}% - \renewcommand*{\glsnumbersgroupname}{Numbers}% - } - {german} { - \selectlanguage{ngerman} - \renewcommand*{\glossaryname}{Glossar}% - \renewcommand*{\acronymname}{Akronyme}% - \renewcommand*{\entryname}{Bezeichnung}% - \renewcommand*{\descriptionname}{Beschreibung}% - \renewcommand*{\symbolname}{Symbol}% - \renewcommand*{\pagelistname}{Seiten}% - \renewcommand*{\glssymbolsgroupname}{Symbole}% - \renewcommand*{\glsnumbersgroupname}{Zahlen}% - } - {ngerman} { - \selectlanguage{ngerman} - \renewcommand*{\glossaryname}{Glossar}% - \renewcommand*{\acronymname}{Akronyme}% - \renewcommand*{\entryname}{Bezeichnung}% - \renewcommand*{\descriptionname}{Beschreibung}% - \renewcommand*{\symbolname}{Symbol}% - \renewcommand*{\pagelistname}{Seiten}% - \renewcommand*{\glssymbolsgroupname}{Symbole}% - \renewcommand*{\glsnumbersgroupname}{Zahlen}% - } - {french} { - \selectlanguage{french} - \FrenchFootnotes - \g__nwejm_french_crefname_tl - \renewcommand*{\glossaryname}{Glossaire}% - \renewcommand*{\acronymname}{Acronymes}% - \renewcommand*{\entryname}{Terme}% - \renewcommand*{\descriptionname}{Description}% - \renewcommand*{\symbolname}{Symbole}% - \renewcommand*{\pagelistname}{Pages}% - \renewcommand*{\glssymbolsgroupname}{Symboles}% - \renewcommand*{\glsnumbersgroupname}{Nombres}% - \renewcommand*{\glspluralsuffix}{s} - \renewcommand*{\glsacrpluralsuffix}{} - \renewcommand*{\glsupacrpluralsuffix}{} - } - {dutch} { - \selectlanguage{dutch} - \renewcommand*{\glossaryname}{Woordenlijst}% - \renewcommand*{\acronymname}{Acroniemen}% - \renewcommand*{\entryname}{Benaming}% - \renewcommand*{\descriptionname}{Beschrijving}% - \renewcommand*{\symbolname}{Symbool}% - \renewcommand*{\pagelistname}{Pagina's}% - \renewcommand*{\glssymbolsgroupname}{Symbolen}% - \renewcommand*{\glsnumbersgroupname}{Cijfers}% - } - }% - \inputfrom{./}{#2} - \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist { - footnote, - section, - figure, - table, - equation - } - \clist_map_inline:Nn \g__nwejm_counters_to_be_reset_clist { - \@ifundefined{c@##1}{ - }{ - \setcounter{##1}{\c_zero_int} - } - } - \glsresetall - \selectlanguage{english} -} -\AtBeginDocument{% +\AddToHook{begindocument}{% \tl_new:N \g__nwejm_bib_issue_date_tl \tl_gset:Nn \g__nwejm_bib_issue_date_tl { @@ -846,7 +758,6 @@ \tl_new:N \g__nwejm_title_tl \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 @@ -1442,7 +1353,7 @@ \cs_generate_variant:Nn \__nwejm_new_theorem:nnnnnnnnn { nVVVVVVVV } \RenewDocumentCommand \newtheorem { O{} m } { - \AtBeginDocument{ + \AddToHook{begindocument}{ \tl_clear:N \l__nwejm_newtheorem_style_tl \tl_clear:N \l__nwejm_newtheorem_title_tl \tl_clear:N \l__nwejm_newtheorem_french_title_tl @@ -1648,7 +1559,7 @@ } } } -\AfterEndPreamble{ +\AddToHook{begindocument/end}{ \ifcurrentbaselanguage{french}{\g__nwejm_french_crefname_tl}{} } \clist_set:Nn \l_tmpa_clist {% @@ -2163,7 +2074,7 @@ left=<, right=> } -\AtEndPreamble{\allowdisplaybreaks} +\AddToHook{begindocument/before}{\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 @@ -2450,7 +2361,7 @@ }{ } } -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \defbibheading{__nwejm_subbibliography}[\refname]{% \section*{#1} }% @@ -2476,13 +2387,16 @@ } } \exp_after:wN\addbibresource\exp_after:wN{\c__nwejm_issue_bib_path_string_tl} -\ifkp@easyscsl -\DeclareRobustCommand{\itshape}{\not@math@alphabet\itshape\mathit% - \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% - \fontshape\itdefault}\selectfont} -\fi -\DeclareMathAlphabet\mathfrak{U}{euf}{m}{n} -\SetMathAlphabet\mathfrak{bold}{U}{euf}{b}{n} +\sys_if_engine_pdftex:T +{ + \ifkp@easyscsl + \DeclareRobustCommand{\itshape}{\not@math@alphabet\itshape\mathit% + \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% + \fontshape\itdefault}\selectfont} + \fi + \DeclareMathAlphabet\mathfrak{U}{euf}{m}{n} + \SetMathAlphabet\mathfrak{bold}{U}{euf}{b}{n} +} \expandafter\def\expandafter\pdfstringdefPreHook \expandafter{% \pdfstringdefPreHook @@ -2526,12 +2440,12 @@ } \xspace } -\AfterEndPreamble{% +\AddToHook{begindocument/end}{% \titleformat{\chapter}[block] {\normalfont\centering}{}{0pt}{} \titlespacing*{\chapter}{0pt}{0pt}{0pt} } -\AtEndPreamble{% +\AddToHook{begindocument/before}{% \@ifpackageloaded{xy}{% \msg_error:nn{ nwejmart @@ -2541,7 +2455,7 @@ } \ExplSyntaxOff %% -%% Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr> +%% Copyright (C) 2015-2021 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 |