[latex3-commits] [git/LaTeX3-latex3-latex3] master: Forward options to frozen versions (e3a97d720)

[PhelypeOleinik]

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

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

commit e3a97d720b2c5a26494048b3c466ffaffeea759b
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Wed Mar 3 23:09:15 2021 -0300

    Forward options to frozen versions
    
    Fixes #862


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

e3a97d720b2c5a26494048b3c466ffaffeea759b
 l3packages/xparse/xparse.dtx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index 4b0f70caf..f51189d05 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -1009,16 +1009,22 @@
   \if\relax#2\relax\else#1\fi#2#3#4 }
 %</2ekernel>
 \ExplSyntaxOn
+\cs_set_protected:Npn \@@_tmp:w #1
+  {
+    \DeclareOption* { \PassOptionsToPackage { \CurrentOption } {#1} }
+    \ProcessOptions \relax
+    \RequirePackage {#1}
+  }
 \cs_if_free:NTF \NewDocumentCommand
   {
     \ExplSyntaxOff
     \ifnum\expandafter
         \@parse at version\fmtversion//00\@nil <
         \@parse at version 2020-10-01//00\@nil
-      \RequirePackage{xparse-2018-04-12}
+      \@@_tmp:w { xparse-2018-04-12 }
     \else
 %<2ekernel>      \@@@@input xparse-generic.tex ~
-%<package>      \RequirePackage{xparse-2020-10-01}
+%<package>      \@@_tmp:w { xparse-2020-10-01 }
     \fi
     \file_input_stop:
   }
@@ -1036,7 +1042,7 @@
     \ExplSyntaxOff
     \cs_if_exist:NF \@@_start:nNNnnn
       {
-        \RequirePackage{xparse-2020-10-01}
+        \@@_tmp:w { xparse-2020-10-01 }
         \file_input_stop:
       }
   }