1 files changed, 12 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx
index bfa8b3cf4e2..38b38bd3658 100644
--- a/Master/texmf-dist/source/latex/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex/base/ltclass.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file. 
 % 
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltclass.dtx}
-             [2004/01/28 v1.1g LaTeX Kernel (Class & Package Interface)]
+             [2007/08/05 v1.1h LaTeX Kernel (Class & Package Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltclass.dtx}
@@ -1161,11 +1161,13 @@
 %
 % \changes{v0.2f}{1993/11/22}
 %         {Made the default [] not [\cs{@unknownversion}]}
+% \changes{v1.1h}{2007/08/05}
+%         {Prevent loss of brackets PR/3965}
 %    \begin{macrocode}
 \def\@fileswith@ptions#1[#2]#3{%
   \@ifnextchar[%]
-  {\@fileswith@pti@ns#1[#2]#3}%
-  {\@fileswith@pti@ns#1[#2]#3[]}}
+  {\@fileswith@pti@ns#1[{#2}]#3}%
+  {\@fileswith@pti@ns#1[{#2}]#3[]}}
 \@onlypreamble\@fileswith@ptions
 %    \end{macrocode}
 % Then we do some work.
@@ -1195,17 +1197,19 @@
 % \changes{v0.2z}{1994/02/10}
 %         {Renamed \cs{@compatibility} to \cs{@documentclasshook}.
 %          ASAJ.}
+% \changes{v1.1h}{2007/08/05}
+%         {Prevent loss of brackets PR/3965}
 %    \begin{macrocode}
 \def\@fileswith@pti@ns#1[#2]#3[#4]{%
   \ifx#1\@clsextension
     \ifx\@classoptionslist\relax
       \xdef\@classoptionslist{\zap@space#2 \@empty}%
       \def\reserved@a{%
-        \@onefilewithoptions#3[#2][#4]#1%
+        \@onefilewithoptions#3[{#2}][{#4}]#1%
         \@documentclasshook}%
     \else
       \def\reserved@a{%
-        \@onefilewithoptions#3[#2][#4]#1}%
+        \@onefilewithoptions#3[{#2}][{#4}]#1}%
     \fi
   \else
 %    \end{macrocode}
@@ -1215,7 +1219,8 @@
     \def\reserved@b##1,{%
       \ifx\@nil##1\relax\else
         \ifx\relax##1\relax\else
-         \noexpand\@onefilewithoptions##1[#2][#4]\noexpand\@pkgextension
+         \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
+         \noexpand\@pkgextension
         \fi
         \expandafter\reserved@b
       \fi}%