diff options
12 files changed, 24 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/latex/xpackages/xbase/ldcsetup.pdf b/Master/texmf-dist/doc/latex/xpackages/xbase/ldcsetup.pdf Binary files differindex 59fad8a0d68..db02bbe34ad 100644 --- a/Master/texmf-dist/doc/latex/xpackages/xbase/ldcsetup.pdf +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/ldcsetup.pdf diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/template-test.tex b/Master/texmf-dist/doc/latex/xpackages/xbase/template-test.tex index 5684ce7a90f..5684ce7a90f 100644 --- a/Master/texmf-dist/source/latex/xpackages/xbase/template-test.tex +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/template-test.tex diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/template-test2.tex b/Master/texmf-dist/doc/latex/xpackages/xbase/template-test2.tex index 489e9f2304a..489e9f2304a 100644 --- a/Master/texmf-dist/source/latex/xpackages/xbase/template-test2.tex +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/template-test2.tex diff --git a/Master/texmf-dist/doc/latex/xpackages/xbase/template.pdf b/Master/texmf-dist/doc/latex/xpackages/xbase/template.pdf Binary files differindex 61fae371165..40153f38ca7 100644 --- a/Master/texmf-dist/doc/latex/xpackages/xbase/template.pdf +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/template.pdf diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/tprestrict-test.tex b/Master/texmf-dist/doc/latex/xpackages/xbase/tprestrict-test.tex index d981888d450..d981888d450 100644 --- a/Master/texmf-dist/source/latex/xpackages/xbase/tprestrict-test.tex +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/tprestrict-test.tex diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/xparse-test.tex b/Master/texmf-dist/doc/latex/xpackages/xbase/xparse-test.tex index 8614c4ed06a..8614c4ed06a 100644 --- a/Master/texmf-dist/source/latex/xpackages/xbase/xparse-test.tex +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/xparse-test.tex diff --git a/Master/texmf-dist/doc/latex/xpackages/xbase/xparse.pdf b/Master/texmf-dist/doc/latex/xpackages/xbase/xparse.pdf Binary files differindex 90c64ec0228..43b8a86025a 100644 --- a/Master/texmf-dist/doc/latex/xpackages/xbase/xparse.pdf +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/xparse.pdf diff --git a/Master/texmf-dist/doc/latex/xpackages/xbase/xtemplate.pdf b/Master/texmf-dist/doc/latex/xpackages/xbase/xtemplate.pdf Binary files differindex 3a1cb4026c8..fd6a2a6c431 100644 --- a/Master/texmf-dist/doc/latex/xpackages/xbase/xtemplate.pdf +++ b/Master/texmf-dist/doc/latex/xpackages/xbase/xtemplate.pdf diff --git a/Master/texmf-dist/source/latex/xpackages/xtras/l3keys2e-demo.tex b/Master/texmf-dist/doc/latex/xpackages/xtras/l3keys2e-demo.tex index a00531e0741..a00531e0741 100644 --- a/Master/texmf-dist/source/latex/xpackages/xtras/l3keys2e-demo.tex +++ b/Master/texmf-dist/doc/latex/xpackages/xtras/l3keys2e-demo.tex diff --git a/Master/texmf-dist/doc/latex/xpackages/xtras/l3keys2e.pdf b/Master/texmf-dist/doc/latex/xpackages/xtras/l3keys2e.pdf Binary files differindex f3b1e7af46b..e10d40f7726 100644 --- a/Master/texmf-dist/doc/latex/xpackages/xtras/l3keys2e.pdf +++ b/Master/texmf-dist/doc/latex/xpackages/xtras/l3keys2e.pdf diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx b/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx index 45b7ab9bb96..f1d6ebf872d 100644 --- a/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx +++ b/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx @@ -41,7 +41,7 @@ \RequirePackage{l3names} %</driver|package> %\fi -\GetIdInfo$Id: xparse.dtx 1905 2010-05-19 07:45:31Z joseph $ +\GetIdInfo$Id: xparse.dtx 1927 2010-05-23 11:00:21Z joseph $ {Generic document command parser} %\iffalse %<*driver> @@ -191,6 +191,28 @@ % argument processors is a somewhat advanced topic, (or at least a less % commonly used feature) and is covered in Section~\ref{sec:processors}. % +%\subsection{Spacing and optional arguments} +% +% TeX will find the first argument after a function name irrespective +% of any intervening spaces. This is true for both mandatory and +% optional arguments. So "\foo[arg]" and \verb*"\foo [arg]" are +% equivalent. Spaces are also ignored when collecting arguments up +% to the last mandatory argument to be collected (as it must exist). +% So after +%\begin{verbatim} +% \DeclareDocumentCommand \foo { m o m } { ... } +%\end{verbatim} +% the user input "\foo{arg1}[arg2]{arg3}" and +% \verb*"\foo{arg1} [arg2] {arg3}" will both be parsed in the same +% way. However, spaces are \emph{not} ignored when parsing optional +% arguments after the last mandatory argument. Thus with +%\begin{verbatim} +% \DeclareDocumentCommand \foo { m o } { ... } +%\end{verbatim} +% "\foo{arg1}[arg2]" will find an optional argument but +% \verb*"\foo{arg1} [arg2]" will not. This is so that trailing optional +% arguments are not picked up `by accident' in input. +% %\subsection{Declaring commands and environments} % % With the concept of an argument specifier defined, it is now diff --git a/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty b/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty index d3a64fcc10f..2b3f8cd388b 100644 --- a/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty +++ b/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty @@ -57,7 +57,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{l3names} -\GetIdInfo$Id: xparse.dtx 1905 2010-05-19 07:45:31Z joseph $ +\GetIdInfo$Id: xparse.dtx 1927 2010-05-23 11:00:21Z joseph $ {Generic document command parser} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} |