grid-system

git-svn-id: svn://tug.org/texlive/trunk@32981 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 12 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/grid-system/grid-system.pdf b/Master/texmf-dist/doc/latex/grid-system/grid-system.pdf
index 31b7e98562e..f37c5bd9357 100644
--- a/Master/texmf-dist/doc/latex/grid-system/grid-system.pdf
+++ b/Master/texmf-dist/doc/latex/grid-system/grid-system.pdf
diff --git a/Master/texmf-dist/doc/latex/grid-system/grid-system.tex b/Master/texmf-dist/doc/latex/grid-system/grid-system.tex
index 89c380d38b9..746e87dbec9 100644
--- a/Master/texmf-dist/doc/latex/grid-system/grid-system.tex
+++ b/Master/texmf-dist/doc/latex/grid-system/grid-system.tex
@@ -6,11 +6,8 @@
 
 \usepackage[default,scale=0.95]{opensans}
 \usepackage[scaled=0.85]{beramono}
-%\usepackage[default,semibold]{sourcecodepro}
-%\usepackage[default,semibold]{sourcesanspro}
 
-
-\usepackage{listings}
+\usepackage{listings,minted}
 \usepackage{grid-system}
 \usepackage{tabularx}
 \usepackage{booktabs}
@@ -43,22 +40,22 @@ Grid system is a package that implements grid-like layouts for \LaTeX, as it is
 
 \section{Usage}
 \subsection{Overview}
-There are two methods to divide your row into multiple columns. The first one with uppercase \emph{Cell} and \emph{Row} is easier to use as it collects the content of the cells and calculates everything for you. As a result, it might break on certain contents (e.g. footnotes). For such cases, the second method with lowercase \emph{row} and \emph{cell} will work. These are more capable, but need more configuration.
+%There are two methods to divide your row into multiple columns. The first one with uppercase \emph{Cell} and \emph{Row} is easier to use as it collects the content of the cells and calculates everything for you. As a result, it might break on certain contents (e.g. footnotes). For such cases, the second method with lowercase \emph{row} and \emph{cell} will work. These are more capable, but need more configuration.
 
 \medskip
 
-\subsection{The simple way}
+\subsection{Default use:}
 \minisec{Example:}
-\begin{lstlisting}
+\begin{minted}{latex}
 \begin{Row}%
     \begin{Cell}{2}
-    This is a long row spanning two thirds of the text width. This one cannot have footnotes.
+    This is a long row spanning two thirds of the text width.
     \end{Cell}
     \begin{Cell}{1}
     This is a long row spanning one third of the text width.
     \end{Cell}
 \end{Row}
-\end{lstlisting}
+\end{minted}
 
 \minisec{Output:}
 \begin{Row}%
@@ -72,7 +69,9 @@ There are two methods to divide your row into multiple columns. The first one wi
 
 \clearpage
 
-\subsection{The complete way}
+\subsection{The (old) fallback}
+In earlier implementations, the default interface from above would not work for many content. As this has changed, this fallback will become deprecated in the next version unless someone finds an important case to keep it.
+
 \begin{lstlisting}
 \begin{row}{<Total number of columns}{<Number of cells>}%
 	\begin{cell}{<Number of columns to span>}
diff --git a/Master/texmf-dist/tex/latex/grid-system/grid-system.sty b/Master/texmf-dist/tex/latex/grid-system/grid-system.sty
index 13d2e91c2ce..1ae9e686aa1 100644
--- a/Master/texmf-dist/tex/latex/grid-system/grid-system.sty
+++ b/Master/texmf-dist/tex/latex/grid-system/grid-system.sty
@@ -1,5 +1,5 @@
 % !TeX root=demo.tex
-\ProvidesPackage{grid-system}[2014/01/16 v. 0.2.0 LaTeX Grid System]
+\ProvidesPackage{grid-system}[2014/02/16 v. 0.3.0 LaTeX Grid System]
 
 \RequirePackage{calc}
 \RequirePackage{xkeyval}
@@ -47,9 +47,9 @@
 
 \NewEnviron{Cell}[1]{%
 	%\global\@namedef{gridsystem@cellcontent\arabic{gridsystem@cellcount}}{\BODY}%
-	\edef\@celltemp{\BODY}%
+	%\edef\@celltemp{\BODY}%
 	%\global\@namedef{gridsystem@cellcontent\arabic{gridsystem@cellcount}}{\@celltemp}%
-	\expandafter\global\expandafter\edef\csname gridsystem@cellcontent\arabic{gridsystem@cellcount}\endcsname{\@celltemp}%
+	\expandafter\global\expandafter\let\csname gridsystem@cellcontent\arabic{gridsystem@cellcount}\endcsname\BODY%
 	\global\@namedef{gridsystem@cellwidth\arabic{gridsystem@cellcount}}{#1}%
 	\stepcounter{gridsystem@cellcount}%
 	\addtocounter{gridsystem@stripecount}{#1}%