[latex3-commits] [git/LaTeX3-latex3-latex3] master: Correct handling of class backend option (aa3cc922f)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/aa3cc922fed568431ed09c684ae424ac44934f22

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

commit aa3cc922fed568431ed09c684ae424ac44934f22
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Oct 14 17:54:19 2019 +0100

    Correct handling of class backend option
    
    'Timing' issue!


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

aa3cc922fed568431ed09c684ae424ac44934f22
 l3kernel/CHANGELOG.md |  4 ++++
 l3kernel/l3sys.dtx    | 45 ++++++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 0c6dd7e22..88173d42d 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+
+- Correct handling of 'traditional' class options for backend
+
 ## [2019-10-11]
 
 ### Changed
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index c476e67e2..5db2bb78f 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -812,9 +812,28 @@
 %
 % \subsubsection{Configurations}
 %
-% 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{variable}{\g_@@_backend_tl}
+%   As the backend has to be checked and possibly adjusted, the approach here
+%   is to create a variable and use that in a one-shot to set a constant.
+%    \begin{macrocode}
+\tl_new:N \g_@@_backend_tl
+\@@_finalise:n
+  {
+    \tl_gset:Nx \g_@@_backend_tl
+      {
+        \sys_if_engine_xetex:TF
+          { xdvipdfmx }
+          {
+             \sys_if_output_pdf:TF
+              { pdfmode }
+              { dvips }
+           }
+      }
+  }
+%    \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}
 \@@_finalise:n
   {
@@ -843,26 +862,6 @@
       }
   }
 %    \end{macrocode}
-%
-% \begin{variable}{\g_@@_backend_tl}
-%   As the backend has to be checked and possibly adjusted, the approach here
-%   is to create a variable and use that in a one-shot to set a constant.
-%    \begin{macrocode}
-\tl_new:N \g_@@_backend_tl
-\@@_finalise:n
-  {
-    \tl_gset:Nx \g_@@_backend_tl
-      {
-        \sys_if_engine_xetex:TF
-          { xdvipdfmx }
-          {
-             \sys_if_output_pdf:TF
-              { pdfmode }
-              { dvips }
-           }
-      }
-  }
-%    \end{macrocode}
 % \end{variable}
 %
 %    \begin{macrocode}