probsoln 3.01 (22aug11)

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

23 files changed, 437 insertions, 543 deletions

diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/1stprncp.tex b/Master/texmf-dist/doc/latex/probsoln/samples/1stprncp.tex
deleted file mode 100644
index 514abf57763..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/1stprncp.tex
+++ /dev/null
@@ -1,61 +0,0 @@
- % These all involve differentiating from 1st principles
-
-\newproblem{dfp:xcube}{%
-Differentiate $f(x) = x^3$ with respect to $x$ by first principles.}{%
-\begin{eqnarray*}
-\frac{dy}{dx} & = & \lim_{\Delta x\rightarrow 0}\frac{f(x+\Delta x) - f(x)}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{(x+\Delta x)^3-x^3}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{(x+\Delta x)(x^2+2x\Delta x+(\Delta x)^2)-x^3}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{x^3+3x^2\Delta x+3x(\Delta x)^2+(\Delta x)^3-x^3}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{3x^2\Delta x+3x(\Delta x)^2+(\Delta x)^3}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}3x^2+3x\Delta x + (\Delta x)^2\\
- & = & 3x^2
-\end{eqnarray*}}
-
-\newproblem{dfp:Ioverxsq}{%
-Differentiate $\displaystyle f(x) = \frac{1}{x^2}$ with respect to $x$ by first principles.}{%
-\begin{eqnarray*}
-\frac{df}{dx} & = & \lim_{\Delta x\rightarrow 0}\frac{\frac{1}{(x+\Delta x)^2}-\frac{1}{x^2}}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{\frac{x^2-(x+\Delta x)^2}{x^2(x+\Delta x)^2}}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{x^2-(x^2+2x\Delta x+(\Delta x)^2)}{x^2\Delta x(x+\Delta x)^2}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{-2x\Delta x-(\Delta x)^2}{x^2\Delta x(x+\Delta x)^2}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{-2x-\Delta x}{x^2(x+\Delta x)^2}\\
- & = & \frac{-2x}{x^2x^2}\\
- & = & -\frac{2}{x^3}
-\end{eqnarray*}}
-
-\newproblem{dfp:sqrtx}{%
-Differentiate from first principles $f(x) = \surd x$}{%
-\begin{eqnarray*}
-\frac{df}{dx} & = & \lim_{\Delta x\rightarrow 0}\frac{\sqrt{x+\Delta x}-\surd x}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{(\sqrt{x+\Delta x}-\surd x)(\sqrt{x+\delta x}+\surd x)}{\Delta x(\sqrt{x+\Delta x}+\surd x)}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{x+\Delta x - x}{\Delta x(\sqrt{x+\Delta x}+\surd x)}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{\Delta x}{\Delta x(\sqrt{x+\Delta x}+\Delta x)}\\
- & = & \lim_{\Delta x\rightarrow 0}\frac{1}{\sqrt{x+\Delta x}+\surd x}\\
- & = & \frac{1}{2\surd x}
-\end{eqnarray*}}
-
-\newproblem{dfp:cons}{%
-Differentiate from first principles $f(x) = c$ where $c$ is a constant.}{%
-\begin{eqnarray*}
-\frac{df}{dx} & = & \lim_{\Delta x\rightarrow 0}\frac{c-c}{\Delta x}\\
- & = & \lim_{\Delta x\rightarrow 0}0\\
- & = & 0
-\end{eqnarray*}}
-
-\newproblem{dfp:cosx}{%
-Given 
-\begin{eqnarray*}
-\lim_{x \rightarrow 0} \frac{\cos x - 1}{x} & = & 0\\
-\lim_{x \rightarrow 0} \frac{\sin x}{x} & = & 1
-\end{eqnarray*}
-differentiate from first principles $f(x) = \cos x$.}{%
-\begin{eqnarray*}
-\frac{df}{dx} & = & \lim_{\Delta x \rightarrow 0}\frac{f(x + \Delta x) - f(x)}{\Delta x}\\
- & = & \lim_{\Delta x \rightarrow 0} \frac{\cos(x + \Delta x) - \cos(x)}{\Delta x}\\
- & = & \lim_{\Delta x \rightarrow 0} \frac{\cos x\cos\Delta x - \sin x\sin\Delta x - \cos x}{\Delta x}\\
- & = & \lim_{\Delta x \rightarrow 0} \frac{\cos x(\cos\Delta x - 1) - \sin x\sin\Delta x}{\Delta x}\\
- & = & \cos x\lim_{\Delta x \rightarrow 0}\frac{\cos\Delta x - 1}{\Delta x} 
-      - \sin x\lim_{\Delta x \rightarrow 0}\frac{\sin\Delta x}{\Delta x}\\
- & = & -1 \qquad\mbox{(using given results)}
-\end{eqnarray*}}
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/args.tex b/Master/texmf-dist/doc/latex/probsoln/samples/args.tex
deleted file mode 100644
index 77278d86530..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/args.tex
+++ /dev/null
@@ -1,45 +0,0 @@
- % These problems require arguments
-
- % Arguments: #1->a_2, #2->a_1 and #3->a_0
- % (Arguments must be integers)
-\newcount\ctr
-\newproblem[3]{diff:quad}{%
-\(f(x) = 
-\ifnum#1=0
-\else
-\ifnum#1=1\else#1\fi x^2 
-\fi
-\ifnum#2=0
-\else
-\ifnum#2>0 \ifnum#1=0 \else + \fi \fi
-\ifnum#2=1\else#2\fi x 
-\fi
-\ifnum#3=0
-\else
-\ifnum#3>0 \ifnum#2=0 \ifnum#1=0 \else + \fi \else + \fi\fi
-#3
-\fi\)
-}{%
-\(f'(x) = 
-\ifnum#1=0
-\else
-\ctr=2
-\multiply\ctr by #1
-\the\ctr x 
-\fi
-\ifnum#2=0
-\else
-\ifnum#2>0 \ifnum#1=0 \else + \fi \fi
-#2
-\fi
- % print 0 if both #1 and #2 are 0
-\ifnum#1=0 \ifnum#2=0 0 \fi\fi 
-\)
-}
-
-\newproblem[1]{diff:sin}{%
-\(f(x) = \sin(#1x)\)
-}{%
-\(f'(x) = #1\cos(#1x)\)
-}
-
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/easy.tex b/Master/texmf-dist/doc/latex/probsoln/samples/easy.tex
deleted file mode 100644
index 0833f7e9527..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/easy.tex
+++ /dev/null
@@ -1,85 +0,0 @@
- % These are all easy differentiation problems
-
-\newproblem{diffeasy:gpowh}{%
-\(f(x) = g(x)^{h(x)}.\)}{%
-\begin{eqnarray*}
-f(x) & = & e^{\ln g(x)^{h(x)}}\\
- & = & e^{h(x)\ln g(x)}\\
-f'(x) & = & e^{h(x)\ln g(x)}(h'(x)\ln g(x) + h(x)\frac{g'(x)}{g(x)})\\
- & = & g(x)^{h(x)}(h'(x)\ln g(x) + \frac{h(x)g'(x)}{g(x)})
-\end{eqnarray*}}
-
-\newproblem{diffeasy:arcsin}{%
-\(y = \arcsin(x)\)}{%
-\[\sin(y) = x\]
-diff. w.r.t. $x$:
-\begin{eqnarray*}
-\cos y \frac{dy}{dx} & = & 1\\
-\frac{dy}{dx} & = & \frac{1}{\cos y}\\
- & = & \frac{1}{\sqrt{1 - \sin^2y}}\\
- & = & \frac{1}{\sqrt{1-x^2}}.
-\end{eqnarray*}}
-
-\newproblem{diffeasy:arccos}{%
-$y = \arccos x$.}{%
-\(\cos y = x\)
-diff. w.r.t. $x$:
-\begin{eqnarray*}
--\sin y \frac{dy}{dx} & = & 1\\
-\frac{dy}{dx} & = & \frac{-1}{\sin y}\\
- & = & \frac{-1}{\sqrt{1-\cos^2y}}\\
- & = & \frac{-1}{\sqrt{1-x^2}}
-\end{eqnarray*}}
-
-\newproblem{diffeasy:tan}{%
-\(y = \tan x\)}{%
-\begin{eqnarray*}
-y & = & \tan x\\
- & = & \frac{\sin x}{\cos x}\\
-\frac{dy}{dx} & = & \frac{\cos x}{\cos x} + \sin x\times\frac{-1}{\cos^2x}\times -\sin x\\
- & = & 1 + \tan^2x\\
- & = & \sec^2x.
-\end{eqnarray*}}
-
-\newproblem{diffeasy:arctan}{%
-\(y = \arctan x = \tan^{-1}x\)}{%
-\[\tan y = x\]
-diff w.r.t. $x$:
-\begin{eqnarray*}
-\sec^2y\frac{dy}{dx} & = & 1\\
-\frac{dy}{dx} & = & \frac{1}{\sec^2y}\\
- & = & \frac{1}{1+\tan^2y}\\
- & = & \frac{1}{1+x^2}
-\end{eqnarray*}}
-
-\newproblem{diffeasy:cot}{%
-\(y = (\tan x)^{-1} = \cot x\)}{%
-\begin{eqnarray*}
-\frac{dy}{dx} & = & -(\tan x)^{-2}\sec^2x\\
- & = & -\frac{\cos^2x}{\sin^2x}\cdot\frac{1}{\cos^2x}\\
- & = & \frac{-1}{\sin^2x}\\
- & = & -\csc^2x.
-\end{eqnarray*}}
-
-\newproblem{diffeasy:cosxsqsinx}{%
-$y = \cos(x^2)\sin x$.}{%
-\[\frac{dy}{dx} = -\sin(x^2)2x\sin x + \cos(x^2)\cos x\]}
-
-\newproblem{diffeasy:xlnx}{%
-$y = (x+1)\ln(x+1)$.}{%
-\begin{eqnarray*}
-\frac{dy}{dx} & = & \ln(x+1) + \frac{x+1}{x+1}\\
- & = & 1 + \ln(x+1).
-\end{eqnarray*}}
-
-\newproblem{diffeasy:glng}{%
-$f(x) = g(x)\ln(g(x))$.}{%
-\begin{eqnarray*}
-f'(x) & = & g'(x)\ln(g(x)) + \frac{g(x)}{g(x)}g'(x)\\
- & = & g'(x)(1+\ln(g(x))).
-\end{eqnarray*}}
-
-\newproblem{diffeasy:sinx/x}{%
-$y = \frac{\sin x}{x}$.}{%
-\[\frac{dy}{dx} = \frac{\cos x}{x} - \frac{\sin x}{x^2}\]}
-
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/easy2.tex b/Master/texmf-dist/doc/latex/probsoln/samples/easy2.tex
deleted file mode 100644
index 9958efcb41c..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/easy2.tex
+++ /dev/null
@@ -1,135 +0,0 @@
- % These are all easy differentiation problems
-
-\begin{defproblem}{diffeasy:gpowh}%
-\begin{onlyproblem}%
-\(f(x) = g(x)^{h(x)}.\)%
-\end{onlyproblem}%
-\begin{onlysolution}%
-\begin{eqnarray*}
-f(x) & = & e^{\ln g(x)^{h(x)}}\\
- & = & e^{h(x)\ln g(x)}\\
-f'(x) & = & e^{h(x)\ln g(x)}(h'(x)\ln g(x) + h(x)\frac{g'(x)}{g(x)})\\
- & = & g(x)^{h(x)}(h'(x)\ln g(x) + \frac{h(x)g'(x)}{g(x)})
-\end{eqnarray*}%
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:arcsin}%
-\begin{onlyproblem}%
-\(y = \arcsin(x)\)%
-\end{onlyproblem}%
-\begin{onlysolution}%
-\[\sin(y) = x\]
-diff. w.r.t. $x$:
-\begin{eqnarray*}
-\cos y \frac{dy}{dx} & = & 1\\
-\frac{dy}{dx} & = & \frac{1}{\cos y}\\
- & = & \frac{1}{\sqrt{1 - \sin^2y}}\\
- & = & \frac{1}{\sqrt{1-x^2}}.
-\end{eqnarray*}
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:arccos}%
-\begin{onlyproblem}%
-$y = \arccos x$.%
-\end{onlyproblem}%
-\begin{onlysolution}%
-\(\cos y = x\)
-diff. w.r.t. $x$:
-\begin{eqnarray*}
--\sin y \frac{dy}{dx} & = & 1\\
-\frac{dy}{dx} & = & \frac{-1}{\sin y}\\
- & = & \frac{-1}{\sqrt{1-\cos^2y}}\\
- & = & \frac{-1}{\sqrt{1-x^2}}
-\end{eqnarray*}
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:tan}%
-\begin{onlyproblem}%
-\(y = \tan x\)%
-\end{onlyproblem}
-\begin{onlysolution}%
-\begin{eqnarray*}
-y & = & \tan x\\
- & = & \frac{\sin x}{\cos x}\\
-\frac{dy}{dx} & = & \frac{\cos x}{\cos x} + \sin x\times\frac{-1}{\cos^2x}\times -\sin x\\
- & = & 1 + \tan^2x\\
- & = & \sec^2x.
-\end{eqnarray*}
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:arctan}%
-\begin{onlyproblem}%
-\(y = \arctan x = \tan^{-1}x\)%
-\end{onlyproblem}%
-\begin{onlysolution}%
-\[\tan y = x\]
-diff w.r.t. $x$:
-\begin{eqnarray*}
-\sec^2y\frac{dy}{dx} & = & 1\\
-\frac{dy}{dx} & = & \frac{1}{\sec^2y}\\
- & = & \frac{1}{1+\tan^2y}\\
- & = & \frac{1}{1+x^2}
-\end{eqnarray*}
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:cot}%
-\begin{onlyproblem}%
-\(y = (\tan x)^{-1} = \cot x\)%
-\end{onlyproblem}
-\begin{onlysolution}%
-\begin{eqnarray*}
-\frac{dy}{dx} & = & -(\tan x)^{-2}\sec^2x\\
- & = & -\frac{\cos^2x}{\sin^2x}\cdot\frac{1}{\cos^2x}\\
- & = & \frac{-1}{\sin^2x}\\
- & = & -\csc^2x.
-\end{eqnarray*}
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:cosxsqsinx}%
-\begin{onlyproblem}%
-$y = \cos(x^2)\sin x$.%
-\end{onlyproblem}%
-\begin{onlysolution}%
-\[\frac{dy}{dx} = -\sin(x^2)2x\sin x + \cos(x^2)\cos x\]
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:xlnx}%
-\begin{onlyproblem}%
-$y = (x+1)\ln(x+1)$.
-\end{onlyproblem}%
-\begin{onlysolution}%
-\begin{eqnarray*}
-\frac{dy}{dx} & = & \ln(x+1) + \frac{x+1}{x+1}\\
- & = & 1 + \ln(x+1).
-\end{eqnarray*}
-\end{onlysolution}
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:glng}%
-\begin{onlyproblem}%
-$f(x) = g(x)\ln(g(x))$.
-\end{onlyproblem}
-\begin{onlysolution}%
-\begin{eqnarray*}
-f'(x) & = & g'(x)\ln(g(x)) + \frac{g(x)}{g(x)}g'(x)\\
- & = & g'(x)(1+\ln(g(x))).
-\end{eqnarray*}
-\end{onlysolution}%
-\end{defproblem}
-
-\begin{defproblem}{diffeasy:sinx/x}
-\begin{onlyproblem}%
-$y = \frac{\sin x}{x}$.
-\end{onlyproblem}
-\begin{onlysolution}%
-\[\frac{dy}{dx} = \frac{\cos x}{x} - \frac{\sin x}{x^2}\]
-\end{onlysolution}%
-\end{defproblem}
-
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/implicit.tex b/Master/texmf-dist/doc/latex/probsoln/samples/implicit.tex
deleted file mode 100644
index 7f37fe0041f..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/implicit.tex
+++ /dev/null
@@ -1,41 +0,0 @@
- % These are all implicit differentiation problems
-
-\newproblem{imd:circ}{%
-Find the gradient of the unit circle ($x^2 + y^2 = 1$).}{%
-Differentiating with respect to $x$ gives:
-\begin{eqnarray*}
-2x + 2y\frac{dy}{dx} & = & 0\\
-\frac{dy}{dx} & = & \frac{-2x}{2y}\\
- & = & \frac{-x}{\sqrt{1-x^2}}.
-\end{eqnarray*}}
-
-\newproblem{imd:ysq:xcuov2mx}{%
-Find $\frac{dy}{dx}$, given
-\begin{displaymath}
-y^2 = \frac{x^3}{2-x}
-\end{displaymath}}{%
-Differentiating both sides w.r.t.\ $x$:
-\begin{eqnarray*}
-2y\frac{dy}{dx} & = & \frac{(2-x)3x^2 - x^3(-1)}{(2-x)^2}\\
- & = & \frac{3x^2(2-x) + x^3}{(2-x)^2}\\
- & = & \frac{6x^2 - 3x^3 + x^3}{(2-x)^2}\\
- & = & \frac{6x^2-2x^3}{(2-x)^2}\\
- & = & 2x^2\frac{3-x}{(2-x)^2}
-\end{eqnarray*}
-Therefore
-\begin{displaymath}
-y\frac{dy}{dx} = x^2\frac{3-x}{(2-x)^2}
-\end{displaymath}}
-
-\newproblem{imd:exy:IIxay}{%
-Differentiate w.r.t.\ $x$:
-\begin{displaymath}
-e^{xy} = 2x + y
-\end{displaymath}}{%
-Differentiating both sides w.r.t.\ $x$:
-\begin{eqnarray*}
-e^{xy}(1y + x\frac{dy}{dx}) & = & 2 + \frac{dy}{dx}\\
-xe^{xy}\frac{dy}{dx} - \frac{dy}{dx} & = & 2 - ye^{xy} \\
-\frac{dy}{dx}(xe^{xy}-1) & = & 2 - ye^{xy}\\
-\frac{dy}{dx} & = & \frac{2-ye^{xy}}{xe^{xy}-1}
-\end{eqnarray*}}
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/mchoice.tex b/Master/texmf-dist/doc/latex/probsoln/samples/mchoice.tex
deleted file mode 100644
index 7add557a680..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/mchoice.tex
+++ /dev/null
@@ -1,34 +0,0 @@
-\newproblem{mc:prod}{%
-Which of the following is the derivative of $x\sin(x)$?
-(Circle the correct answer.)
-\ifthenelse{\boolean{showanswers}}{}%
-{\begin{description}
-\item[A] $\sin(x)$
-\item[B] $x\cos(x)$
-\item[C] $\sin(x) + x\cos(x)$
-\end{description}
-}}{%
-\begin{description}
-\item[A] $\sin(x)$
-\item[B] $x\cos(x)$
-\item[\textcircled{C}] $\sin(x) + x\cos(x)$ (product rule).
-\end{description}
-}
-
-\newproblem{mc:quot}{%
-Which of the following is the derivative of $\frac{\sin(x)}{x}$?
-(Circle the correct answer.)
-\ifthenelse{\boolean{showanswers}}{}%
-{\begin{description}
-\item[A] $\sin(x)$
-\item[B] $\cos(x)$
-\item[C] $\frac{\cos(x)x-\sin(x)}{x^2}$
-\end{description}
-}}{%
-\begin{description}
-\item[A] $\sin(x)$
-\item[B] $\cos(x)$
-\item[\textcircled{C}] $\frac{\cos(x)x-\sin(x)}{x^2}$
-(quotient rule)
-\end{description}
-}
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/newdata.tex b/Master/texmf-dist/doc/latex/probsoln/samples/newdata.tex
deleted file mode 100644
index 82179a34ef0..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/newdata.tex
+++ /dev/null
@@ -1,26 +0,0 @@
-\begin{defproblem}{sample}
-\begin{onlyproblem}
-Differentiate $y=\sin x$
-\end{onlyproblem}
-\begin{onlysolution}
-$y'=\cos x$
-\end{onlysolution}
-\end{defproblem}
-
-\begin{defproblem}[1]{sample2}
-\begin{onlyproblem}
-Differentiate $y = \sin(#1x)$
-\end{onlyproblem}
-\begin{onlysolution}
-$y'=#1\cos #1x$
-\end{onlysolution}
-\end{defproblem}
-
-\begin{defproblem}{sample3}
-\begin{onlyproblem}
-Differentiate $y = x^2$.
-\end{onlyproblem}
-\begin{onlysolution}
-$y' = 2x$
-\end{onlysolution}
-\end{defproblem}
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/nosoln.tex b/Master/texmf-dist/doc/latex/probsoln/samples/nosoln.tex
deleted file mode 100644
index 96ea6438aaa..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/nosoln.tex
+++ /dev/null
@@ -1,7 +0,0 @@
- % these problems don't have solutions
-
-\newproblem*{oop}{Describe what is meant by object-oriented
-programming.}
-
-\newproblem*{inheritance}{Describe what is meant by the term 
-\emph{inheritance} in object-oriented programming. Use examples.}
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/probspaces.tex b/Master/texmf-dist/doc/latex/probsoln/samples/probspaces.tex
deleted file mode 100644
index 48f7c3c53d8..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/probspaces.tex
+++ /dev/null
@@ -1,31 +0,0 @@
- % Finite probability spaces
-\newproblem{weightedcoin}{%
-A coin is weighted so that heads is four times as likely
-as tails. Find the probability that:
-\begin{textenum}
-\item tails appears,
-\item heads appears
-\end{textenum}}{%
-Let $p=P(T)$, then $P(H)=4p$. We require $P(H)+P(T)=1$,
-so $4p+p=1$, hence $p=\frac{1}{5}$. Therefore:
-\begin{textenum}
-\item $P(T)=\frac{1}{5}$,
-\item $P(H)=\frac{4}{5}$
-\end{textenum}}
-
-\newproblem*{validprobspaces}{%
-Under which of the following functions does 
-$S=\{a_1,a_2\}$ become a probability space?
-\par
-\begin{textenum}
-\begin{tabular}{ll}
-\incorrectitem $P(a_1)=\frac{1}{3}$, $P(a_2)=\frac{1}{2}$
-&
-\correctitem $P(a_1)=\frac{3}{4}$, $P(a_2)=\frac{1}{4}$
-\\
-\correctitem $P(a_1)=1$, $P(a_2)=0$
-&
-\incorrectitem $P(a_1)=\frac{5}{4}$, $P(a_2)=-\frac{1}{4}$
-\end{tabular}
-\end{textenum}
-}
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/probspaces2.tex b/Master/texmf-dist/doc/latex/probsoln/samples/probspaces2.tex
deleted file mode 100644
index 26839b65293..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/probspaces2.tex
+++ /dev/null
@@ -1,41 +0,0 @@
- % Finite probability spaces
-\begin{defproblem}{weightedcoin}
-\begin{onlyproblem}%
-A coin is weighted so that heads is four times as likely
-as tails. Find the probability that:
-\begin{textenum}
-\item tails appears,
-\item heads appears
-\end{textenum}
-\end{onlyproblem}
-\begin{onlysolution}%
-Let $p=P(T)$, then $P(H)=4p$. We require $P(H)+P(T)=1$,
-so $4p+p=1$, hence $p=\frac{1}{5}$. Therefore:
-\begin{textenum}
-\item $P(T)=\frac{1}{5}$,
-\item $P(H)=\frac{4}{5}$
-\end{textenum}
-\end{onlysolution}
-\end{defproblem}
-
-\begin{defproblem}{validprobspaces}
-\begin{onlyproblem}%
-Under which of the following functions does 
-$S=\{a_1,a_2\}$ become a probability space?
-\par
-\begin{textenum}
-\begin{tabular}{ll}
-\item $P(a_1)=\frac{1}{3}$, $P(a_2)=\frac{1}{2}$
-&
-\item\label{validprobspacescorrect1} $P(a_1)=\frac{3}{4}$, $P(a_2)=\frac{1}{4}$
-\\
-\item\label{validprobspacescorrect2} $P(a_1)=1$, $P(a_2)=0$
-&
-\item $P(a_1)=\frac{5}{4}$, $P(a_2)=-\frac{1}{4}$
-\end{tabular}
-\end{textenum}
-\end{onlyproblem}%
-\begin{onlysolution}%
-\ref{validprobspacescorrect1} and \ref{validprobspacescorrect2}%
-\end{onlysolution}
-\end{defproblem}
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample.pdf b/Master/texmf-dist/doc/latex/probsoln/samples/sample.pdf
new file mode 100644
index 00000000000..bd16cbf85ad
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample.pdf
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample.tex b/Master/texmf-dist/doc/latex/probsoln/samples/sample.tex
index e80c8dff020..6627c165ae4 100644
--- a/Master/texmf-dist/doc/latex/probsoln/samples/sample.tex
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample.tex
@@ -1,3 +1,52 @@
+%%
+%% This is file `sample.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% probsoln.dtx  (with options: `sample.tex,package')
+%% 
+%%  probsoln.dtx
+%%  Copyright 2011 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Nicola Talbot.
+%% 
+%%  This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex.
+%% 
+%% \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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%% randomly select 25 problems from derivatives.tex and add to
+%% the data set called 'deriv'
+%% Display the problems
+%% You may need to change \theenumi back here
+%% randomly select 25 problems from probspaces.tex and add to
+%% the data set called 'spaces'
+%% Display the problems
+%% You may need to change \theenumi back here
+ % This file is public domain
 \documentclass[a4paper]{article}
 
 \usepackage{probsoln}
@@ -5,9 +54,32 @@
 \showanswers
 
  % The following will generate a different set of
- % problems in subsequent years
+ % problems each year
  %\PSNrandseed{\year}
-\PSNrandseed{2007}
+
+ % Load 1 problem randomly selected from the given file
+ % and store in database 'firstprinciples':
+\loadrandomproblems[firstprinciples]{1}{prob-1stprncp}
+
+ % Load 5 problems randomly selected from the given file
+ % and store in database 'easy':
+\loadrandomproblems[easy]{5}{prob-easy}
+
+ % Load 2 problems randomly selected from the given file
+ % and store in database 'implicit':
+\loadrandomproblems[implicit]{2}{prob-implicit}
+
+ % Load 2 problems randomly selected from the given file
+ % and store in database 'probspaces':
+\loadrandomproblems[probspaces]{2}{prob-probspaces}
+
+ % Load 1 problem randomly selected from the given file
+ % and store in database 'mchoice':
+\loadrandomproblems[mchoice]{1}{prob-mchoice}
+
+ % Load 1 problem randomly selected from the given file
+ % and store in database 'nosoln':
+\loadrandomproblems[nosoln]{1}{prob-nosoln}
 
 \begin{document}
 \title{Sample Problem Sheet}
@@ -16,27 +88,27 @@
 
 \begin{enumerate}
  % Differentiation from first principles
-\selectrandomly{1stprncp}{1}
+ \foreachproblem[firstprinciples]{\item \thisproblem}
 
 \item Differentiate the following functions:
-\newcount\oldseed
-\PSNgetrandseed\oldseed
 \begin{enumerate}
-\selectrandomly{easy}{5}
+  \foreachproblem[easy]{\item \thisproblem}
 \end{enumerate}
-\PSNrandseed\oldseed
 
  % Implicit differentiation
-\selectrandomly{implicit}{2}
+\foreachproblem[implicit]{\item \thisproblem}
 
  % Finite probability spaces
-\selectrandomly{probspaces}{2}
+\foreachproblem[probspaces]{\item \thisproblem}
 
  % Multiple choice question
-\selectrandomly{mchoice}{1}
+\foreachproblem[mchoice]{\item \thisproblem}
 
  % select one essay style question that doesn't come with a solution
 
-\selectrandomly{nosoln}{1}
+\foreachproblem[nosoln]{\item \thisproblem}
 \end{enumerate}
 \end{document}
+\endinput
+%%
+%% End of file `sample.tex'.
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample2.pdf b/Master/texmf-dist/doc/latex/probsoln/samples/sample2.pdf
new file mode 100644
index 00000000000..dc760dd57ad
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample2.pdf
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample2.tex b/Master/texmf-dist/doc/latex/probsoln/samples/sample2.tex
index e82656c9f3a..8054e753e8d 100644
--- a/Master/texmf-dist/doc/latex/probsoln/samples/sample2.tex
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample2.tex
@@ -1,3 +1,52 @@
+%%
+%% This is file `sample2.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% probsoln.dtx  (with options: `sample2.tex,package')
+%% 
+%%  probsoln.dtx
+%%  Copyright 2011 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Nicola Talbot.
+%% 
+%%  This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex.
+%% 
+%% \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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%% randomly select 25 problems from derivatives.tex and add to
+%% the data set called 'deriv'
+%% Display the problems
+%% You may need to change \theenumi back here
+%% randomly select 25 problems from probspaces.tex and add to
+%% the data set called 'spaces'
+%% Display the problems
+%% You may need to change \theenumi back here
+ % This file is public domain
 \documentclass[a4paper]{article}
 
 \usepackage{probsoln}
@@ -25,10 +74,10 @@
 \random{numproblems}{1}{3}
 
  % selects 1,2 or 3 problems from 1 of the given files:
-\doforrandN{1}{\file}{1stprncp,implicit}{\selectrandomly{\file}{\value{numproblems}}}
+\doforrandN{1}{\file}{prob-1stprncp,prob-implicit}{\selectrandomly{\file}{\value{numproblems}}}
 
 \item Differentiate the following functions:
-\input{args}% load database
+\input{prob-args}% load database
 \begin{enumerate}
 \newcounter{A}
 \newcounter{B}
@@ -45,3 +94,6 @@
 \end{enumerate}
 \end{enumerate}
 \end{document}
+\endinput
+%%
+%% End of file `sample2.tex'.
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample3.pdf b/Master/texmf-dist/doc/latex/probsoln/samples/sample3.pdf
new file mode 100644
index 00000000000..91812c4451a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample3.pdf
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample3.tex b/Master/texmf-dist/doc/latex/probsoln/samples/sample3.tex
index 35252593b33..f5020372ce4 100644
--- a/Master/texmf-dist/doc/latex/probsoln/samples/sample3.tex
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample3.tex
@@ -1,3 +1,52 @@
+%%
+%% This is file `sample3.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% probsoln.dtx  (with options: `sample3.tex,package')
+%% 
+%%  probsoln.dtx
+%%  Copyright 2011 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Nicola Talbot.
+%% 
+%%  This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex.
+%% 
+%% \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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%% randomly select 25 problems from derivatives.tex and add to
+%% the data set called 'deriv'
+%% Display the problems
+%% You may need to change \theenumi back here
+%% randomly select 25 problems from probspaces.tex and add to
+%% the data set called 'spaces'
+%% Display the problems
+%% You may need to change \theenumi back here
+ % This file is public domain
 \documentclass[a4paper]{article}
 
 \usepackage{longtable}
@@ -17,8 +66,11 @@
 
 \begin{document}
 \begin{longtable}{lrrrl}
-\bfseries Question & \bfseries A & \bfseries B & 
+\bfseries Question & \bfseries A & \bfseries B &
 \bfseries C & \ifshowanswers \bfseries Reason\fi\\
-\selectrandomly{tabmchoice}{2}
+\selectrandomly{prob-tabmchoice}{2}
 \end{longtable}
 \end{document}
+\endinput
+%%
+%% End of file `sample3.tex'.
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample4.pdf b/Master/texmf-dist/doc/latex/probsoln/samples/sample4.pdf
new file mode 100644
index 00000000000..c454080cde7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample4.pdf
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample4.tex b/Master/texmf-dist/doc/latex/probsoln/samples/sample4.tex
index f82eef21182..46456dc0590 100644
--- a/Master/texmf-dist/doc/latex/probsoln/samples/sample4.tex
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample4.tex
@@ -1,16 +1,72 @@
+%%
+%% This is file `sample4.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% probsoln.dtx  (with options: `sample4.tex,package')
+%% 
+%%  probsoln.dtx
+%%  Copyright 2011 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Nicola Talbot.
+%% 
+%%  This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex.
+%% 
+%% \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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%% randomly select 25 problems from derivatives.tex and add to
+%% the data set called 'deriv'
+%% Display the problems
+%% You may need to change \theenumi back here
+%% randomly select 25 problems from probspaces.tex and add to
+%% the data set called 'spaces'
+%% Display the problems
+%% You may need to change \theenumi back here
+ % This file is public domain
 \documentclass[a4paper]{article}
 
 \usepackage{probsoln}
 
- % Sample file illustrating use of \selectallproblems
+ % Sample file illustrating use of \loadallproblems
  % All problems defined in specified file will be used
  % in order of definition
 
-\showanswers
+ \loadallproblems{prob-easy}
+ %\loadselectedproblems{diffeasy:gpowh,diffeasy:arccos}{prob-easy}
+ %\loadexceptproblems{diffeasy:gpowh,diffeasy:arccos}{prob-easy}
+
+ \showanswers
 
 \begin{document}
 Differentiate the following functions:
 \begin{enumerate}
-\selectallproblems{easy}
+  \foreachproblem{\item \thisproblem}
 \end{enumerate}
 \end{document}
+\endinput
+%%
+%% End of file `sample4.tex'.
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample5.pdf b/Master/texmf-dist/doc/latex/probsoln/samples/sample5.pdf
new file mode 100644
index 00000000000..0b18bf6d483
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample5.pdf
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample5.tex b/Master/texmf-dist/doc/latex/probsoln/samples/sample5.tex
index 531170b1d6d..5ad29c56fb0 100644
--- a/Master/texmf-dist/doc/latex/probsoln/samples/sample5.tex
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample5.tex
@@ -1,13 +1,61 @@
+%%
+%% This is file `sample5.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% probsoln.dtx  (with options: `sample5.tex,package')
+%% 
+%%  probsoln.dtx
+%%  Copyright 2011 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Nicola Talbot.
+%% 
+%%  This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex.
+%% 
+%% \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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%% randomly select 25 problems from derivatives.tex and add to
+%% the data set called 'deriv'
+%% Display the problems
+%% You may need to change \theenumi back here
+%% randomly select 25 problems from probspaces.tex and add to
+%% the data set called 'spaces'
+%% Display the problems
+%% You may need to change \theenumi back here
+ % This file is public domain
 \documentclass[a4paper]{report}
 
 \usepackage{probsoln}
 
 \begin{document}
-
 \hideanswers
 
 \chapter{Easy Problems}
-\loadrandomproblems[easyproblems]{5}{easy2}
+\loadrandomproblems[easyproblems]{5}{prob-easy2}
 
 \renewcommand{\theenumi}{\thechapter.\arabic{enumi}}
 \begin{enumerate}
@@ -15,7 +63,7 @@
 \end{enumerate}
 
 \chapter{Probability Spaces}
-\loadrandomproblems[probspaces]{2}{probspaces2}
+\loadrandomproblems[probspaces]{2}{prob-probspaces2}
 
 \renewcommand{\theenumi}{\thechapter.\arabic{enumi}}
 \begin{enumerate}
@@ -32,3 +80,6 @@
 \end{enumerate}
 
 \end{document}
+\endinput
+%%
+%% End of file `sample5.tex'.
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample6.tex b/Master/texmf-dist/doc/latex/probsoln/samples/sample6.tex
new file mode 100644
index 00000000000..6719c02088f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample6.tex
@@ -0,0 +1,62 @@
+%%
+%% This is file `sample6.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% probsoln.dtx  (with options: `sample6.tex,package')
+%% 
+%%  probsoln.dtx
+%%  Copyright 2011 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Nicola Talbot.
+%% 
+%%  This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex.
+%% 
+%% \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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%% randomly select 25 problems from derivatives.tex and add to
+%% the data set called 'deriv'
+%% Display the problems
+%% You may need to change \theenumi back here
+%% randomly select 25 problems from probspaces.tex and add to
+%% the data set called 'spaces'
+%% Display the problems
+%% You may need to change \theenumi back here
+\documentclass{article}
+
+\usepackage[usedefaultargs]{probsoln}
+
+\loadallproblems{prob-args}
+
+\begin{document}
+\begin{enumerate}
+\foreachproblem{\item \thisproblem}
+\end{enumerate}
+\end{document}
+\endinput
+%%
+%% End of file `sample6.tex'.
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/sample7.tex b/Master/texmf-dist/doc/latex/probsoln/samples/sample7.tex
new file mode 100644
index 00000000000..8bf5b5ecc67
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/probsoln/samples/sample7.tex
@@ -0,0 +1,71 @@
+%%
+%% This is file `sample7.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% probsoln.dtx  (with options: `sample7.tex,package')
+%% 
+%%  probsoln.dtx
+%%  Copyright 2011 Nicola Talbot
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Nicola Talbot.
+%% 
+%%  This work consists of the files probsoln.dtx and probsoln.ins and the derived files probsoln.sty, sample.tex, sample2.tex, sample3.tex, sample4.tex, sample5.tex, sample6.tex, sample7.tex, prob-1stprncp.tex, prob-args.tex, prob-easy.tex, prob-easy2.tex, prob-implicit.tex, prob-mchoice.tex, prob-mixed.tex, prob-newdata.tex, prob-nosoln.tex, prob-probspaces.tex, prob-probspaces2.tex, prob-tabmchoice.tex.
+%% 
+%% \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
+%%   Lower-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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%% randomly select 25 problems from derivatives.tex and add to
+%% the data set called 'deriv'
+%% Display the problems
+%% You may need to change \theenumi back here
+%% randomly select 25 problems from probspaces.tex and add to
+%% the data set called 'spaces'
+%% Display the problems
+%% You may need to change \theenumi back here
+\documentclass{article}
+
+\usepackage{tikz}
+\usepackage{probsoln}
+
+\loadallproblems{prob-mixed}
+
+\begin{document}
+\section{Exercises}
+\begin{enumerate}
+  \foreachproblem{\item\label{q-\thisproblemlabel} \thisproblem}
+\end{enumerate}
+
+\section{Solutions}
+\showanswers
+
+\begin{enumerate}
+  \foreachsolution{\item[\ref{q-\thisproblemlabel}] \thisproblem}
+\end{enumerate}
+\end{document}
+\endinput
+%%
+%% End of file `sample7.tex'.
diff --git a/Master/texmf-dist/doc/latex/probsoln/samples/tabmchoice.tex b/Master/texmf-dist/doc/latex/probsoln/samples/tabmchoice.tex
deleted file mode 100644
index 39cd1f10e41..00000000000
--- a/Master/texmf-dist/doc/latex/probsoln/samples/tabmchoice.tex
+++ /dev/null
@@ -1,16 +0,0 @@
- % These problems are designed to be placed in a
- % tabular environment
- %
-\newproblem{tab:1}{%
-What is $(3+2)\times5$? &
-25 \ifshowanswers\selected\else\notselected\fi &
-13 \notselected &
-10 \notselected &
-}{Brackets come first}%
-
-\newproblem{tab:2}{%
-What is $-1+2\times3$? &
-3 \notselected &
--7 \notselected &
-5 \ifshowanswers\selected\else\notselected\fi &
-}{Multiplication comes first}%