8 files changed, 46 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf b/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf
index 2670d3cdacc..0a617684092 100644
--- a/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf
+++ b/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf
diff --git a/Master/texmf-dist/source/latex/ydoc/ydoc.dtx b/Master/texmf-dist/source/latex/ydoc/ydoc.dtx
index be3645188bb..b4cd14a106c 100644
--- a/Master/texmf-dist/source/latex/ydoc/ydoc.dtx
+++ b/Master/texmf-dist/source/latex/ydoc/ydoc.dtx
@@ -35,7 +35,7 @@
 %<expl>    [ydoc-expl]
 %<doc>     [ydoc-doc]
 %<*driver|class|package|code|desc|expl|doc>
-    {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+    {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $}
     [v0.4alpha]
 %</driver|class|package|code|desc|expl|doc>
 %<class>   [ydoc class: document LaTeX class and packages]
@@ -74,7 +74,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1459}
+% \CheckSum{1488}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -1275,8 +1275,24 @@
 %
 % \begin{macro}{\read@Macro@marg}
 %    \begin{macrocode}
-\def\read@Macro@marg#1{%
-  \@marg{#1}\read@Macro@arg
+\def\read@Macro@marg{%
+    \begingroup
+    \afterassignment\read@Macro@marg@
+    \let\@let@token=%
+}
+\def\read@Macro@marg@{%
+    \setbox\@tempboxa\hbox\bgroup
+        \color@setgroup\bgroup
+        \aftergroup\color@endgroup
+        \aftergroup\egroup
+        \aftergroup\read@Macro@marg@@
+        \let\end@Macro@args\empty%
+        \read@Macro@arg
+}
+\def\read@Macro@marg@@{%
+  \@marg{\usebox\@tempboxa}%
+  \endgroup
+  \read@Macro@arg
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1348,6 +1364,7 @@
   \begingroup
   \let\do\@makeother
   \dospecials
+  \obeyspaces
   \read@Macro@verb@
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty
index a9b010ad1d4..4034d1fc43d 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty
@@ -29,7 +29,7 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackageSVN
     [ydoc-code]
-    {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+    {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $}
     [v0.4alpha]
     [ydoc package to document macro code]
 \RequirePackage{hyperref}
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
index 99b00e20a07..607efc48538 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
@@ -29,7 +29,7 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackageSVN
     [ydoc-desc]
-    {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+    {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $}
     [v0.4alpha]
     [ydoc package to describe macros, environments, options etc.]
 \RequirePackage{hyperref}
@@ -147,8 +147,24 @@
 }
 \def\after@Macro@args{%
 }
-\def\read@Macro@marg#1{%
-  \@marg{#1}\read@Macro@arg
+\def\read@Macro@marg{%
+    \begingroup
+    \afterassignment\read@Macro@marg@
+    \let\@let@token=%
+}
+\def\read@Macro@marg@{%
+    \setbox\@tempboxa\hbox\bgroup
+        \color@setgroup\bgroup
+        \aftergroup\color@endgroup
+        \aftergroup\egroup
+        \aftergroup\read@Macro@marg@@
+        \let\end@Macro@args\empty%
+        \read@Macro@arg
+}
+\def\read@Macro@marg@@{%
+  \@marg{\usebox\@tempboxa}%
+  \endgroup
+  \read@Macro@arg
 }
 \def\read@Macro@oarg[#1]{%
   \@oarg{#1}\read@Macro@arg
@@ -179,6 +195,7 @@
   \begingroup
   \let\do\@makeother
   \dospecials
+  \obeyspaces
   \read@Macro@verb@
 }
 \def\read@Macro@verb@'#1'{%
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty
index 983ae2ab978..aae0b73166f 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty
@@ -29,7 +29,7 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackageSVN
      [ydoc-doc]
-    {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+    {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $}
     [v0.4alpha]
      [ydoc package to provide 'doc' macros]
 \newcount\ydoc@bslashcnt
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty
index 6247f8bd527..cdb13c65bf7 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty
@@ -29,7 +29,7 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackageSVN
     [ydoc-expl]
-    {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+    {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $}
     [v0.4alpha]
     [ydoc package to insert live examples of LaTeX code]
 \RequirePackage{listings}
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls
index 3684a2fea0d..97223c97fbf 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls
@@ -27,7 +27,7 @@
 %%
 \RequirePackage{svn-prov}[2010/04/03]
 \ProvidesClassSVN
-    {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+    {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $}
     [v0.4alpha]
    [ydoc class: document LaTeX class and packages]
 \LoadClassWithOptions{article}
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty
index b0031b430f9..2b1cca878b2 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty
@@ -28,7 +28,7 @@
 \RequirePackage{svn-prov}[2010/04/03]
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackageSVN
-    {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+    {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $}
     [v0.4alpha]
  [ydoc package: document LaTeX class and packages]
 \RequirePackage{ydoc-code}