1 files changed, 16 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty b/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
index 545e15e638f..54a54d36c3a 100644
--- a/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
+++ b/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package csvsimple - version 1.05 (2012/03/12)
+%% The LaTeX package csvsimple - version 1.06 (2012/11/08)
 %% csvsimple.sty: Simple LaTeX CSV file processing
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2011 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csvsimple}[2012/03/12 version 1.05 LaTeX CSV file processing]
+\ProvidesPackage{csvsimple}[2012/11/08 version 1.06 LaTeX CSV file processing]
 
 \RequirePackage{pgfkeys,ifthen}
 
@@ -89,8 +89,9 @@
   \ifx\csv@termination#1\let\nextcol=\relax\else%
     \let\nextcol=\csv@breakline%
     \stepcounter{csvcol}%
-    \edef\csv@col@body{#1}\TrimSpaces\csv@col@body%
-    \expandafter\xdef\csname csvcol\roman{csvcol}\endcsname{\csv@col@body}%
+    \def\csv@col@body{#1}\TrimSpaces\csv@col@body%
+    \toks@\expandafter{\csv@col@body}%
+    \expandafter\xdef\csname csvcol\roman{csvcol}\endcsname{\the\toks@}%
   \fi%
   \nextcol%
   }
@@ -103,7 +104,8 @@
 
 % expands a CSV line and scans content
 \def\csv@escanline#1{%
-  \edef\@csv@scanline{\noexpand\csv@scanline{#1}}%
+  \toks@\expandafter{#1}%
+  \edef\@csv@scanline{\noexpand\csv@scanline{\the\toks@}}%
   \@csv@scanline%
   }
 
@@ -434,9 +436,15 @@
 }
 
 
-\def\csvautotabular#1{\csvloop{autotabular={#1}}}
+\long\def\csv@autotabular[#1]#2{\csvloop{autotabular={#2},#1}}
 
-\def\csvautolongtable#1{\csvloop{autolongtable={#1}}}
+\def\csvautotabular{%
+  \@ifnextchar[{\csv@autotabular}{\csv@autotabular[]}}
+
+\long\def\csv@autolongtable[#1]#2{\csvloop{autolongtable={#2},#1}}
+
+\def\csvautolongtable{%
+  \@ifnextchar[{\csv@autolongtable}{\csv@autolongtable[]}}
 
 \def\csvstyle#1#2{\csvset{#1/.style={#2}}}