2 files changed, 44 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 10e95bc30fb..3058cc086bf 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -692,7 +692,7 @@
 \def\fmtname{LaTeX2e}
 \edef\fmtversion
    {2021-06-01}
-\def\patch@level{0}
+\def\patch@level{1}
 \edef\development@branch@name{}
 \iffalse
 \def\reserved@a#1/#2/#3\@nil{%
@@ -12807,7 +12807,7 @@ Type  H <return>  for immediate help.}%
 \@onlypreamble\@p@pfilename
 \gdef\@currnamestack{}
 \@onlypreamble\@currnamestack
-\gdef\@kernel@currpathstack{}
+\gdef\@kernel@currpathstack{}%
 \def\@p@pfilepath#1{%
   \gdef\@currpath{#1}\@p@pfilepath@aux\@empty}
 \def\@p@pfilepath@aux#1\@nil{%
@@ -12927,8 +12927,10 @@ Type  H <return>  for immediate help.}%
     \csname opt@#3.#1\expandafter\endcsname
     \csname opt@\reserved@a\endcsname
     \@ifundefined{@raw@opt@#3.#1}%
-      {\expandafter\gdef\csname @raw@opt@#3.#1\endcsname{#2}}%
-      {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\endcsname{,#2}}%
+      {\expandafter\gdef\csname @raw@opt@#3.#1\expandafter\endcsname
+                \expandafter{#2}}%
+      {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\expandafter\endcsname
+                \expandafter{\expandafter,#2}}%
 }
 \@onlypreamble\@pass@ptions
 \def\PassOptionsToPackage{\@pass@ptions\@pkgextension}
@@ -13041,6 +13043,8 @@ Type  H <return>  for immediate help.}%
 \def\@loadwithoptions#1#2#3{%
   \expandafter\let\csname opt@#3.#1\expandafter\endcsname
        \csname opt@\@currname.\@currext\endcsname
+  \expandafter\let\csname @raw@opt@#3.#1\expandafter\endcsname
+       \csname @raw@opt@\@currname.\@currext\endcsname
    #2{#3}}
 \@onlypreamble\@loadwithoptions
 \def\LoadClassWithOptions{%
@@ -13208,6 +13212,9 @@ Type  H <return>  for immediate help.}%
     \expandafter\let
       \csname opt@\@currpkg@reqd\expandafter\endcsname
       \csname opt@\@currname.\@currext\endcsname
+    \expandafter\let
+      \csname @raw@opt@\@currpkg@reqd\expandafter\endcsname
+      \csname @raw@opt@\@currname.\@currext\endcsname
     \global\expandafter
     \let\csname ver@\@currname.\@currext\endcsname\@empty
     \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index ffb65fa9a3f..3fdd870890a 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -11729,8 +11729,16 @@ of this package available from CTAN}
 
 \IncludeInRelease{2020/10/01}{\@kernel@currpathstack}%
   {Add \@kernel@currpathstack}%
-\gdef\@kernel@currpathstack{}
-\g@addto@macro\@kernel@currpathstack{{}}
+\@ifundefined{@kernel@currpathstack}{}{\@gobblethree}
+\gdef\@kernel@currpathstack{}%
+\ifx\@kernel@currpathstack\@empty
+  \def\reserved@a#1#2#3{%
+    \ifx\relax#3\else
+      \g@addto@macro\@kernel@currpathstack{{}}%
+      \expandafter\reserved@a
+    \fi}%
+  \expandafter\reserved@a\@currnamestack{}{}{\relax}%
+\fi
 \def\@p@pfilepath#1{%
   \gdef\@currpath{#1}\@p@pfilepath@aux\@empty}
 \def\@p@pfilepath@aux#1\@nil{%
@@ -11900,8 +11908,10 @@ of this package available from CTAN}
     \csname opt@#3.#1\expandafter\endcsname
     \csname opt@\reserved@a\endcsname
     \@ifundefined{@raw@opt@#3.#1}%
-      {\expandafter\gdef\csname @raw@opt@#3.#1\endcsname{#2}}%
-      {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\endcsname{,#2}}%
+      {\expandafter\gdef\csname @raw@opt@#3.#1\expandafter\endcsname
+                \expandafter{#2}}%
+      {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\expandafter\endcsname
+                \expandafter{\expandafter,#2}}%
 }
 \EndIncludeInRelease
 \IncludeInRelease{2020/10/01}{\@pass@ptions}
@@ -12047,6 +12057,22 @@ of this package available from CTAN}
     \edef\CurrentOption{##1}}%
   \expandafter\reserved@a\CurrentOption\@nil}
 \EndIncludeInRelease
+\IncludeInRelease{2021/06/01}%
+                 {\@loadwithoptions}{Raw option lists load with options}%
+\def\@loadwithoptions#1#2#3{%
+  \expandafter\let\csname opt@#3.#1\expandafter\endcsname
+       \csname opt@\@currname.\@currext\endcsname
+  \expandafter\let\csname @raw@opt@#3.#1\expandafter\endcsname
+       \csname @raw@opt@\@currname.\@currext\endcsname
+   #2{#3}}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}
+                 {\@loadwithoptions}{Raw option lists load with options}%
+\def\@loadwithoptions#1#2#3{%
+  \expandafter\let\csname opt@#3.#1\expandafter\endcsname
+       \csname opt@\@currname.\@currext\endcsname
+   #2{#3}}
+\EndIncludeInRelease
 \IncludeInRelease{2020/10/01}%
                  {\RequirePackageWithOptions}{Unused options issue}%
 \def\RequirePackageWithOptions{%
@@ -12230,6 +12256,9 @@ of this package available from CTAN}
     \expandafter\let
       \csname opt@\@currpkg@reqd\expandafter\endcsname
       \csname opt@\@currname.\@currext\endcsname
+    \expandafter\let
+      \csname @raw@opt@\@currpkg@reqd\expandafter\endcsname
+      \csname @raw@opt@\@currname.\@currext\endcsname
     \global\expandafter
     \let\csname ver@\@currname.\@currext\endcsname\@empty
     \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty