From 74105dec94c29f2548c3bbc40e53bb28efd193a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Apr 2018 21:18:46 +0000 Subject: nwejm (9apr18) git-svn-id: svn://tug.org/texlive/trunk@47411 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/nwejm/images/logo-painleve.pdf | 317 ------------- .../tex/latex/nwejm/images/logo-ul1-ufr-math.pdf | 249 ---------- Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl | 1 + .../texmf-dist/tex/latex/nwejm/nwejm-english.trsl | 1 + .../texmf-dist/tex/latex/nwejm/nwejm-french.trsl | 1 + .../texmf-dist/tex/latex/nwejm/nwejm-german.trsl | 1 + Master/texmf-dist/tex/latex/nwejm/nwejm.bbx | 2 +- Master/texmf-dist/tex/latex/nwejm/nwejm.cbx | 15 +- Master/texmf-dist/tex/latex/nwejm/nwejm.cls | 516 ++++++++++++++++---- Master/texmf-dist/tex/latex/nwejm/nwejm.dbx | 34 ++ Master/texmf-dist/tex/latex/nwejm/nwejm.lbx | 2 +- Master/texmf-dist/tex/latex/nwejm/nwejmart.cls | 522 +++++++++++++++++---- 12 files changed, 919 insertions(+), 742 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf delete mode 100644 Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf create mode 100644 Master/texmf-dist/tex/latex/nwejm/nwejm.dbx (limited to 'Master/texmf-dist/tex/latex/nwejm') diff --git a/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf b/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf deleted file mode 100644 index 9b990691e19..00000000000 --- a/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf +++ /dev/null @@ -1,317 +0,0 @@ -%PDF-1.5 % -1 0 obj <> endobj 2 0 obj <>stream - - - - - Adobe Illustrator CS5 - 2016-07-01T11:20:37+02:00 - 2016-07-01T11:20:37+02:00 - 2016-07-01T11:20:37+02:00 - - - - 256 - 184 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAuAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVklxBGeLyKrH oCQDjatLcQMCVkUgDkaEdB3+WKqhNNz0xVwNdx0xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV5h+bF0yatBAkEVwW06dmDwm4mUGaJOcESlSXHPrXY VOY+aNlw9UL6XsfPuUdSign0rQxcCGaN9PX1rW4vxp91KAY2FQXAO4rICOu3fLYfSHJxfSPchm0y 0kkgf6ra3KtFyKR600RjDhS3J/VkL1Jbiw6UP82TZsr8ky31pdfoqS0tbZWjknuRHqH1ub1FMcKs ImHJEfgxO7UPetcVZnirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVUJ7GznkWSaFHkT7DkDkPkeowUtLJ9J0qfj69nBNwBC+pGj0B605A9cKqP+HtA5cv0 Zacv5vQjr/xHFUTHYWMU7XEdvEk77PMqKHPbdgK9sVV8VdirsVdirsVdirsVdirsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs VdirsVdirsVdirsVdirsVdirsVdirsVdir//2Q== - - - - - - 1 - False - False - - 419.999514 - 297.000132 - Millimeters - - - - Cyan - Magenta - Yellow - Black - - - - - - Groupe de nuances par défaut - 0 - - - - - - application/pdf - - - PaulPainlevé-logo-cmjn - - - - - proof:pdf - xmp.did:04801174072068118C14951806C0E8B9 - uuid:469d09bb-a317-284a-afe1-29b99da83110 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - - uuid:7259676c-0c82-0e4f-9077-a7135f0a57a2 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - uuid:cb528f62-dff5-2049-8580-871f81ffb042 - proof:pdf - - - - - saved - xmp.iid:04801174072068118C14951806C0E8B9 - 2016-07-01T11:20:32+02:00 - Adobe Illustrator CS5 - / - - - - - - Adobe PDF library 9.90 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 3 0 obj <> endobj 5 0 obj <>/Properties<>>>/Shading<>>>/TrimBox[0.0 0.0 1190.55 841.89]/Type/Page>> endobj 6 0 obj <>stream -H\Wl +̹z?R'vX؀,"M7䏿q/ӟ>~Wb%c^뷏pz;^Ǐ=\3xZp%_.%Ϗx2x.3+q3!5녗ǿ7 8UtxzWoҸ$L W.+M]2A0(؍rMr{,Cm΄|!"X|fxR"*$d. -FAD8~ ~ 5p.wnUdo _Pj^8g')="e OvkQ6m1n>8/>ۻ+qHddD9C1KO!IOJ4E3Mƕr&Lg퓕 L!sΓ4w"~X4K b:-[ M(5k2:(,_o,V3Iq**FT tHڟ1vA 7U Q,4{3Fl:/=Zs^xoZ 9`3@d7JL7A1V܈I8mRbq|QO, Qd49 <_!fY(3m!>q8!tx5#Fz>Q7&En\)x w90 #;9=$eÆvsXSpTA[!n[u2>M0Y9p5\'>}Xܨq(50`[@~3g`;a 6kQ@Va^>ǐv¡0}<>$l Kl+)'%JħBB \ZY2$ f4DŽ;sցg:r Lfݚ@֥l[zwKT9f6 -UmRtZ33Jtp=JdWԗT8G!XJgMNǎ8{hBb5C5RXJ%0ROniz҂,Yî5 #Rp׼KgV=@Mc+5ĂZ:Xc27ŗ2Rߝ]lZ"Sk3HrD!VX-aD| lQZMȜ<5GB*XsLM-&iRyf)qp)/}7% [;}DX|/eC:g`^C`SPi-_2g9i>/O}ԏ)589K9GF&Q"fit.4f-ΖyAr˥0o5{d-|r|M3۽Nf @02 &+J  dIOYEwi~3}bTbL6fZJ9,aVC7mSKjNɣQYBxjasTHEu*Y#}I,ASq4*F8-41!4_K݈fڣd& t;74V➍v>#l4@a*X*71:lKPJmTG9H^Nyxj*s\oFqAWoq6٪BfDZƼ - redUWp9,Mhݣ+i)U_r|b$q}IisLR6S+K\&$x }Y0>)?X]2|[~&Sb)j$J5ю3ZIUx힪b3'Z*Ǚ4c 9*˿>R3T䮦X!Tiq!#FSCk)|s֡ܔ/LkX6\k -⫦׸n_ZGtt+.,tͪ@7zĔ8g2+ٙ^5 _UDz,`@j11yнDg[*uE$k'v)S!|de ud9\[=Nb<Zc5T76(fQi ò?:ݶxOG\W`YrKsde-(Iђ\nZgmd7K?^n(.7U+&#&G];DF*]b"ƵdEb'Z|hz"_yBUd Z5tqb d -G-bm%?rH1"\Rf^8'+ (6/AT\߉{~y8<h{_Jw6RM#Msi?)i}j -s/3'sǤj,=v1\k5 "<U5Fi&)mL HyްL/m۰cU1P^=jcB_R'\׿m|3E!_Rk48p}DMqӇ̟4b |5# u%:'} nYlR=Z@:V, `u;`2j&&. gwZǥ:֓ЫSյTJ2%<@95OdnYgAþ3h )5lO*3j\Ei%l7gvʪd\ޯ?m<}>FϷ>(Av<zRоpY6i`ASaR7#'M92uyԒWy3tɈ{-QGAmqG$BlyV*nn.o ƛulj\&zQV6 di>E2P $av*wE -d,'ݞ 5+(NVkLηd wR2uvXHڟ N+iV[\v:], h\H?VLXO%`נ9cͮ Ig\?xE7=iPBh -fxPOP^}k۬t~uŸWb W,ɲvאggbJ}t.t@$-MwJ#6yZP;Re5,O$t7Hj#@*1q{|3 "mb?kb~=R&n5mmKYc9l_ 0;^i35FNh7wۦ_mJIKz2 --+zo P;PhlS:Y[볏B=.Mz2F/0^*);f/Db xAE GVƒc R$DsnZW_5?gƟGv?5y5PvrWW?{IQ-pb _ZE7~B)}XE f@P$@U ěPkct8ۉo>,,AD/\)%"\(yDEeQ^Qia^Na3ɐ SJǻl,>0i8 ꭹ"Η?+ݢ3~W1"P[ߏ6%IWfz,n*Kr´ADAoZ ũ~w|?^G|dJ`TQWBݦTO@^sߵ;)<:DJ۸8*7##w -YJi(RllU5NC m#HCuhMFXqԡ[g㐏Ǘl؟V3g{%Ք7+"t]Wm>PZkUǿ _aspn4γ?: '!8tZ9d ;85%)1Yf #.fqmxB 7xOxKʨ?se_6Rg~C^B.uӾqv@AY<7GEbY KZlOw!N'Cw&WnU|S'PIT -5er-?c?f?=AdXM$a* -8*қ ԟ[*`:ov#U;ɯ0VeYf#o L20$p es':6, dq=W54!&?=MXVm'0P_|"Hxj6&W"[T1Yb- |4Wt/X < NE8GZ[Y,4]̝rs $C7W! - EHjKbBс+5.s4?L[Y٧##XN b:3qq3U SqS{.|. cT_Q;KHRWO.gS$ky6 |Z}MX]L ~4sm=LעpZU/X( 4oq]wg/ y>w²'la5zKѡtw=E 2XgAk"Wkj_O؍xun|$.#JhEFTݸLw3mWc;}I[ J!P7`;DM곓}{9Ÿr nwjA[F]&]M^٪3>.5.2TQ2?DZVv$g0xߧzJy#|d&U]F_(<$dhC}q >,PVQo6\_Қ8b$l]F0W%iJ=`7Ǹj-)v!j3̈Ov[h$DB"p0:gGҊYHR7DO]յn%ds﨎P akKTilŽvQȄڷ5[Ʃ,M@w:uns;"Fdeڀf6%H`yQKbTmfSr~fCgT -uuq -4/U {G-6rCco8ÞOcDTK. buZGe461%n46 ƵG0Z?/5 w, ->&I *K űu`re7#"sTm芮}9_7xm$Hv* eLk,LPт cZfO1ʍU7 .`BMAxd4v⎢ m]$ǘS'˞u QÞ#gxrGBJLːj8Q vޝz.5)`rp'ПA9j{T*uೠx <ݭI& "B3;|.R;$8ؙG \X!t>C~"7Dݺ@'5|h^43XW0B KxT' &AֺcD<s#m.cKf @wVwYٹREQ"#݄.p`/Vẓ-(m'ԁaԁ, N$)6- Dv喁oHH .3"$(ܙ̞D6E̖)_܌w.k /:!_ǽm*{KQva䙌5C$N; -=HO&J֮@@%F9r&#Lr!2<=`.c7#W I y,\- -p/#R&o/؉pQR -Ľ\326!YLe.]0&-OY66cr!tr4^ $p{b:Mj:G)R%[1cZ5TLz۬k׼=J/Yԍ_ڙgIP$%8OJ; W'Â1/ -A!jZj*#5T+s@l߉UΪ]pmCk."Tq>ԤQ {^H'{`QORL*G VRS-@Ba'?8~•Jea0˹CNO@ > HwZF?VnTw}?71Z7b ĉ]#9U}+W:ᠯ=贚_T."E9SkvE^ w"fSCm|i|\Ս;m ->IODqf}6#q2':~'Zwڞe;΂C ~Jyhz^N,N=O6jʥ1hnMO߸OHl0"m${+1 65|U~U!Wbϔ> ,l9?c)8XA^6wZ' -ﱈ -BqKNkOqk߮z^L_8V=̀SDc% :nh@s hE%[_h\d vH d0C_8 ҭjʺP X `_z-J]Ϥ1wZ_|j%Yӫu{2 } 2?]Ge6iS|(({w/*VdaNKqƞUGHHZsabrCqb<-O7EbX<ղEuR)k\oaTj 77Ɉ=?Hص1p2ʃaZR?c -C UH\vb hIS`꼢U0y]!m}"-vVnOPיmCڑkkq1. ̦l]dƎ)KB6.R>o˵zvDݥ ?;C>Ys*52h?@S>ߖXN&p>8 jSY">)̛5(EM%BmXT+d (2 j19}plnJ6_[^'[O]1Fa+JǷ듃['QR0H " mv0+svNH\c -H\q%qTZ̤qK'W Z&QQeUws9`A(\iJ -NM=4MDUzzfiZ(۔#$Yz6Mvok,~Qp 혚)#l+:]-Y lUd/z2ɠi;'t0!emhwM3X -!Q*HadU5)%t23T i?cA%읎8M fGQȔ7ozmA|.ŦkȂfԸK)ʂBR ͑C {~di<(nB3x#w}_8e9]2 -PW5! m!KDÝg×W3#)%M f+{Ԙ¶B [9SVc- -q uY~BjXIni/HM}􈏆@i_Y]5xE|°0L)uF'@8qzb⋎Qq5*&]m u\&`w2sa7P@QI 7 -cjڊ=r9^; Rq(ban )`YV%?%6̀d6GU)nWɭѩ" GD%lt?O`J:(wQa7a)C9S>Yܒ({PhRdC>%&<*bS:7I -i -tB0WA1p.mX.ʠ_<5fL_\ZLч"d{w6ʅoJa1"! - ָM9[;YPb%c95ȳ}%h0ז?l͐9QHx}]E/h;:y'ؚHBWZn["&mrL -yj$s9ݷJ"L?/}ƌ ~koNe#nND*Q"dlKZT8LjnfeӈP bâOf|a Cr/PMJ*(ap[Sܟ[x9RF p ^`hsM,;5#r4Mȧ}E F4HXi=ս~}Lcvw)>r5*e@G ~YséZ|\Ox~2/.cFOJ@ohT Lѩ5*I/V\HM×|Aѫ9 -螺09*gu-0KQ;dn&Rϫ\U&*EV ̞

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