[latex3-commits] [git/LaTeX3-latex3-latex3] LaTeX2020: Merge branch 'master' into LaTeX2020 (63ae50466)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : LaTeX2020
Link       : https://github.com/latex3/latex3/commit/63ae50466ec42e0860184f2e2e239908769bc934

>---------------------------------------------------------------

commit 63ae50466ec42e0860184f2e2e239908769bc934
Merge: a6aeb760d 6bb0c2743
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Oct 8 16:00:07 2019 +0100

    Merge branch 'master' into LaTeX2020


>---------------------------------------------------------------

63ae50466ec42e0860184f2e2e239908769bc934
 l3kernel/CHANGELOG.md |  1 +
 l3kernel/expl3.dtx    | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --cc l3kernel/expl3.dtx
index 19bdd949f,83cea5bc2..af8a57106
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@@ -1227,19 -1207,35 +1227,47 @@@
  \fi
  %    \end{macrocode}
  %
 +% If \pkg{expl3} was pre-loaded, we now have to deal with the fact that
 +% the syntax will not be activated for the package mode version:
 +% simply turn it on. We use \tn{@pushfilenameaux} as a marker: it's defined
 +% a little later.
 +%    \begin{macrocode}
 +%<*!2ekernel>
 +\ifdefined\@pushfilenameaux
 +  \ExplSyntaxOn
 +\fi
 +%</!2ekernel>
 +%    \end{macrocode}
 +%
  %    \begin{macrocode}
+ %<@@=sys>
+ %    \end{macrocode}
+ %
+ % If there is a class option set, and recognised, we pick it up: these
+ % will over-ride anything set automatically but will themsevles be
+ % over-written if there is a package option.
+ %    \begin{macrocode}
+ \cs_if_exist:NT \@classoptionslist
+   {
+     \cs_if_eq:NNF \@classoptionslist \scan_stop:
+       {
+         \clist_map_inline:Nn \@classoptionslist
+           {
+             \str_case:nnT {#1}
+               {
+                 { dvipdfmx } { \tl_gset:Nn \g_@@_backend_tl { dvipdfmx } }
+                 { dvips }    { \tl_gset:Nn \g_@@_backend_tl { dvips } }
+                 { dvisvgm }  { \tl_gset:Nn \g_@@_backend_tl { dvisvgm } }
+                 { pdftex }   { \tl_gset:Nn \g_@@_backend_tl { pdfmode } }
+                 { xetex }    { \tl_gset:Nn \g_@@_backend_tl { xdvipdfmx } }
+               }
+               { \clist_remove_all:Nn \@unusedoptionlist {#1} }
+           }
+       }
+   }
+ %    \end{macrocode}
+ %
+ %    \begin{macrocode}
  %<@@=expl>
  %    \end{macrocode}
  %