latex update 2011-05-08

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

9 files changed, 239 insertions, 71 deletions

diff --git a/Master/texmf-dist/source/latex/base/doc.dtx b/Master/texmf-dist/source/latex/base/doc.dtx
index e590e1ddce6..15b6719427b 100644
--- a/Master/texmf-dist/source/latex/base/doc.dtx
+++ b/Master/texmf-dist/source/latex/base/doc.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%           2006 2007 2008 2009 2010
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file. 
 % 
@@ -35,11 +36,11 @@
 %<+package|shortvrb>\NeedsTeXFormat{LaTeX2e}[1994/12/01]
 %<+package> \ProvidesPackage{doc}
 %<+shortvrb>\ProvidesPackage{shortvrb}
-%<+package|shortvrb>  [2006/02/02 v2.1d
+%<+package|shortvrb>  [2010/02/04 v2.1e
 %<+package|shortvrb>   Standard LaTeX documentation package (FMi)]
 %\catcode`\<=12
 %
-% \CheckSum{2171}
+% \CheckSum{2179}
 %% \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
@@ -1748,7 +1749,9 @@
 % \end{macro}
 %
 % \begin{macro}{\mod@math@codes}
-% \changes{v1.7c}{1992/03/26}{Added.} As well as `words', the module
+% \changes{v1.7c}{1992/03/26}{Added.} 
+% \changes{v2.1e}{2010/02/04}{Added mathcodes for +,-,:, and = (pr/4096)} 
+%    As well as `words', the module
 %    directive text might contain any of the characters "*/+-,&|!()"
 %    for the current version of \textsf{docstrip}.  We only need
 %    special action for two of them in the math code changing required
@@ -1756,7 +1759,9 @@
 %    "&" is also made a "\mathop", but in family 0.  Remember that "&"
 %    will not have a special catcode when it's encountered.
 %    \begin{macrocode}
-\def\mod@math@codes{\mathcode`\|="226A \mathcode`\&="2026}
+\def\mod@math@codes{\mathcode`\|="226A \mathcode`\&="2026
+                    \mathcode`\-="702D \mathcode`\+="702B 
+                    \mathcode`\:="703A \mathcode`\=="703D }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/base/ltfntcmd.dtx b/Master/texmf-dist/source/latex/base/ltfntcmd.dtx
index a815151eb41..f246d8b391b 100644
--- a/Master/texmf-dist/source/latex/base/ltfntcmd.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfntcmd.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfntcmd.dtx}
-             [2003/01/01 v3.3z LaTeX Kernel (Font commands)]
+             [2009/12/14 v3.4a LaTeX Kernel (Font commands)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfntcmd.dtx}
@@ -46,7 +46,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{256}
+% \CheckSum{258}
 % 
 %% \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
@@ -522,10 +522,21 @@
 %  \end{macro}
 %  \end{macro}
 %
+% \begin{macro}{\ifmaybe@ic}
+% \changes{v3.4a}{2009/12/14}{Macro added}
+%    Switch used soley within |\maybe@ic| not interferring with other
+%    switches. 
+%    \begin{macrocode}
+\newif\ifmaybe@ic
+%    \end{macrocode}
+% \end{macro}
+
 %  \begin{macro}{\maybe@ic}
 % \changes{v3.0a}{1993/12/11}{Macro name changed}
 %  \begin{macro}{\maybe@ic@}
 % \changes{v3.0a}{1993/12/11}{Macro and name changed}
+% \changes{v3.4a}{2009/12/14}{Use switch \cs{ifmaybe@ic} instead of
+%    \cs{if@tempswa}} 
 % \task{CAR}{Make this more efficient by checking for non-characters
 % first and using \cs{if} test?}
 %    These macros implement the italic correction.
@@ -541,7 +552,7 @@
 %    \begin{macrocode}
   \ifdim  \fontdimen\@ne\font>\z@
   \else
-    \@tempswatrue
+    \maybe@ictrue
 %    \end{macrocode}
 %    It would be possible, but probably not worthwhile, to continue the
 %    forward scan beyond any closing braces.
@@ -566,7 +577,7 @@
 %    of |\nolinebreak|.
 %
 %    \begin{macrocode}
-    \if@tempswa \sw@slant \fi
+    \ifmaybe@ic \sw@slant \fi
   \fi
 }
 %    \end{macrocode}
@@ -583,6 +594,8 @@
 %    If the only things to check were characters then this could be
 %    done via an |\if| thus their catcodes would not matter; but this
 %    will not work whilst |\futurelet| is used above.
+% \changes{v3.4a}{2009/12/14}{Use switch \cs{ifmaybe@ic} instead of
+%    \cs{if@tempswa}} 
 %    \begin{macrocode}
 \def \t@st@ic {%
   \expandafter\let\expandafter\reserved@b\expandafter=\reserved@a\relax
@@ -591,7 +604,7 @@
 %    If they are the same we record the fact and jump out of the loop.
 % \changes{v3.3s}{1995/07/03}{Use clean interface for jump}
 %    \begin{macrocode}
-    \@tempswafalse
+    \maybe@icfalse
     \@break@tfor
   \fi
 }
diff --git a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
index 25ac234848d..8a1f47e2178 100644
--- a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
@@ -36,7 +36,7 @@
 % 
 %
 \ProvidesFile{ltfssdcl.dtx}
-            [2007/08/31 v3.0l LaTeX Kernel (NFSS Declarative Interface)]
+            [2011/05/08 v3.0n LaTeX Kernel (NFSS Declarative Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -52,7 +52,7 @@
 %<+checkmem>\CHECKMEM
 % \fi
 %
-% \CheckSum{1879}
+% \CheckSum{1886}
 %
 %
 % \GetFileInfo{ltfssdcl.dtx}
@@ -110,16 +110,29 @@
 %
 %
 % \begin{macro}{\in@}
+% \changes{v3.0m}{2009/10/20}{More robust thanks to Heiko.}
+% \changes{v3.0n}{2011/05/08}{Simplified thanks to Bruno.}
 % \begin{macro}{\ifin@}
 %    |\@in| is a utility macro with two arguments.  It determines
-%    whether its first argument occurs in its second (after expanding
-%    it) and sets the switch |\if@in| accordingly.
+%    whether its first argument occurs in its second and sets the
+%    switch |\ifin@| accordingly. The first argument may not
+%    contain braces nor |#| (more precisely, tokens of category
+%    code 1,~2, or~6).
 %    \begin{macrocode}
 %<*2ekernel|autoload>
-\def\in@#1#2{%
- \def\in@@##1#1##2##3\in@@{%
-  \ifx\in@##2\in@false\else\in@true\fi}%
- \in@@#2#1\in@\in@@}
+\def\in@#1#2%
+ {%
+   \begingroup
+     \def\in@@##1#1{}%
+     \toks@\expandafter{\in@@#2{}{}#1}%
+     \edef\in@@{\the\toks@}%
+   \expandafter\endgroup
+   \ifx\in@@\@empty
+     \in@false
+   \else
+     \in@true
+   \fi
+ }
 \newif\ifin@
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/base/ltmiscen.dtx b/Master/texmf-dist/source/latex/base/ltmiscen.dtx
index 96305255c86..a040b11e1e4 100644
--- a/Master/texmf-dist/source/latex/base/ltmiscen.dtx
+++ b/Master/texmf-dist/source/latex/base/ltmiscen.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2010
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file. 
 % 
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltmiscen.dtx}
-             [2000/07/11 v1.1j LaTeX Kernel (Misc. Environments)]
+             [2010/08/17 v1.1l LaTeX Kernel (Misc. Environments)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltmiscen.dtx}
@@ -217,16 +217,21 @@
        \let\@setckpt\@gobbletwo
        \let\@newl@bel\@testdef
 %    \end{macrocode}
-% \changes{v1.0z}{1995/07/13}{Sorten redefinition of \cs{bibcite} and
+% \changes{v1.0z}{1995/07/13}{Shorten redefinition of \cs{bibcite} and
 %          \cs{newlabel}}
 %    The previous line is equiv to setting
 %\begin{verbatim}
 %       \def\newlabel{\@testdef r}%
 %       \def\bibcite{\@testdef b}%
 %\end{verbatim}
+% \changes{v1.1k}{2010/08/17}{Use braces around \cs{input} arg (pr/4124)}
+% \changes{v1.1l}{2010/08/17}{Change of plan: use \cs{@@input} instead
+%                             (pr/4124)}
+%    We use |\@@input| to load the \texttt{.aux} file, so that it doesn't
+%    show up in the list of files produced by |\listfiles|.
 %    \begin{macrocode}
        \@tempswafalse 
-       \makeatletter \input\jobname.aux
+       \makeatletter \@@input\jobname.aux
      \fi
 %    \end{macrocode}
 % \changes{v1.0w}{1994/11/30}
diff --git a/Master/texmf-dist/source/latex/base/ltnews18.tex b/Master/texmf-dist/source/latex/base/ltnews18.tex
index 61cfe197c0f..4e6090c02b8 100644
--- a/Master/texmf-dist/source/latex/base/ltnews18.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews18.tex
@@ -45,48 +45,7 @@
 
 \maketitle
 
-% \raisefirstsection
-
-\section{}
-
-\emph{empty shell}
-
-
-\section{Updates of required packages}
-
-\section{Work on \LaTeX{} fixes}
-
-\section{Current development}
-
-The title of this section is a little misleading as it actually
-describes \emph{current} development. In 1998 the \package{expl3}
-bundle of packages was put on \ctan\ to demonstrate a possible \LaTeX3
-programming environment. These packages have been lying dormant for some
-time while the \LaTeX\ Project Team were preoccupied by other things
-such as developing the experimental packages \package{xor},
-\package{template}, etc., (and also writing that indispensable
-and encyclopaedic volume,\\ 
-The \LaTeX{} Companion -- 2nd edition).
-
-In October 2004 work on this code base was resumed with the goal of
-some day turning it into a kernel for \LaTeX3.  This work can now
-also make full use of the widely accepted \eTeX\ extensions. Currently
-two areas are central to this work. 
-
-\begin{itemize} 
-\item Extending the
-  kernel code of \LaTeX3. 
-\item Converting the experimental packages
-  such as \package{xor}, \package{template} to use the new
-  syntax internally. 
-\end{itemize} 
-
-Beware! Development of
-\package{expl3} is happening so fast that the descriptions above might
-be out of date when you read this! If you wish to see what's going on
-then go to
-\url{http://www.latex-project.org/code.html} where you can download
- fully working code (we hope!).  
+\noindent This news never existed.
 
 \end{document}
 
diff --git a/Master/texmf-dist/source/latex/base/ltnews20.tex b/Master/texmf-dist/source/latex/base/ltnews20.tex
new file mode 100644
index 00000000000..909965c82a6
--- /dev/null
+++ b/Master/texmf-dist/source/latex/base/ltnews20.tex
@@ -0,0 +1,150 @@
+% \iffalse meta-comment
+%
+% Copyright 1993--2011
+% The LaTeX3 Project and any individual authors listed elsewhere
+% in this file.
+%
+% This file is part of the LaTeX base system.
+% -------------------------------------------
+%
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%    http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This file has the LPPL maintenance status "maintained".
+%
+% The list of all files belonging to the LaTeX base distribution is
+% given in the file `manifest.txt'. See also `legal.txt' for additional
+% information.
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
+% extension .ins) which are part of the distribution.
+%
+% \fi
+% Filename: ltnews20.tex
+%
+% This is issue 20 of LaTeX News.
+
+\documentclass{ltnews}
+
+\usepackage[T1]{fontenc}
+
+\usepackage{lmodern,url}
+
+\publicationmonth{June}
+\publicationyear{2011}
+
+\publicationissue{20}
+
+\begin{document}
+
+\maketitle
+
+\section{Scheduled \LaTeX\ bug-fix release}
+
+This issue of \LaTeX~News marks the first bug-fix release of
+\LaTeXe\ since shifting to a new build system in 2009.
+Provided sufficient changes are made each year, we expect to
+repeat such releases once per year to stay in sync with \TeX\ Live.
+Due to the excitement of \TeX's $2^5$-th birthday last year,
+we missed our window of opportunity to do so for 2010.
+This situation has been rectified this year!
+
+\section{Continued development}
+
+The \LaTeXe\ program is no longer being actively developed, as any non-negligible changes now could have dramatic backwards compatibility issues with old documents. Similarly, new features cannot be added to the kernel since any new documents written now would then be incompatible with legacy versions of \LaTeX.
+
+The situation on the package level is quite different though. While most of us have stopped developing packages for \LaTeXe{} there are many contributing developers that continue to enrich \LaTeXe{} by providing or extending add-on packages with new or better functionality.
+
+However, the \LaTeX\ team certainly recognises that there are improvements to be made to the kernel code; over the last few years we have been working on building, expanding, and solidifying the \textsf{expl3} programming layer for future \LaTeX\ development. We are using \textsf{expl3} to build new interfaces for package development and tools for document design. Progress here is continuing.
+
+\section{Release notes}
+
+In addition to a few small documentation fixes, the following changes have been made to the \LaTeXe\ code; in accordance with the philosophy of minimising forwards and backwards compatibility problems, most of these will not be noticeable to the regular \LaTeX\ user.
+
+\paragraph{Font subsets covered by Latin Modern and \TeX\ Gyre}
+
+The Latin Modern and \TeX\ Gyre fonts are a modern suite of families based
+on the well-known Computer Modern and `PostScript 16' families with many additional
+characters for high-quality multilingual typesetting.%
+\footnote{%
+  See their respective TUGboat articles for more information:\\
+  \url{http://www.tug.org/TUGboat/tb24-1/jackowski.pdf}\\
+  \url{http://www.tug.org/TUGboat/tb27-2/tb87hagen-gyre.pdf}%
+}
+
+Information about their symbol coverage in the \verb|TS1| encoding is now included
+in \texttt{textcomp}'s default font definitions.
+
+% \paragraph{Private conditional switch in italic correction}
+% negligible improvement/only useful to LaTeX programmers: not worth documenting I think?
+
+% \paragraph{Improve formatting in \texttt{doc} for filenames with some punctuation}
+% negligible improvement, again?
+
+\paragraph{Redefinition of \cs{enddocument}}
+
+Inside the definition of \verb=\end{document}= the \texttt{.aux} file is read back in to resolve cross-references and build the table of contents etc. From 2.09 days this was done using \verb=\input= without any surrounding braces which could lead to some issues in boundary cases, especially if \verb=\input= was redefined by some package. It was therefore changed to use \LaTeXe{}'s internal name for this function. As a result, packages that modify \verb=\enddocument= other than through the officially provided hooks may need to get updated.
+
+\paragraph{Small improvement with split footnotes in \texttt{ftnright}}
+
+If in the first column there is more than a full column worth of footnote
+material the material will be split resulting in footnotes out of
+order. This issue is now at least detected and generates an error but the algorithm used by the package is
+unable to gracefully handle it in an automated fashion (some alternatives for resolving the problem if it happens are given in the package documentation).
+
+\paragraph{Improvement in \texttt{xspace} and font-switching}
+
+The \texttt{xspace} package provides the command \verb|\xspace|
+which attempts to be clever about inserting spaces automatically
+after user-defined control sequences.
+An important bug fix has been made to this command to correct its
+behaviour when used in conjunction with font-switching commands
+such as \verb|\emph| and \verb|\textbf|.
+Previously, writing
+\begin{verbatim}
+  \newcommand\foo{foo\xspace}
+  ... \emph{\foo}  bar baz
+  ... \emph{\foo}, bar baz
+\end{verbatim}
+would result in an extraneous space being inserted after `foo' in
+both cases; this has now been corrected.
+
+
+\paragraph{RTL in \texttt{multicol}}
+
+  The 1.7 release of \texttt{multicol} adds support for languages that are typeset
+  right-to-left. For those languages the order of the columns on the page
+  also need to be reversed---something that wasn't possible in earlier releases.
+
+The new feature is supported through the
+commands \verb|\RLmulticolcolumns| (switching to right-to-left typesetting)
+and \verb|\LRmulticolcolumns| (switching to left-to-right typesetting) the
+latter being the default.
+
+\paragraph{Improve French \texttt{babel} interaction with \texttt{varioref}}
+
+ Extracting and saving the page number turned out to be a soure of subtle
+ bugs. Initially it was done through an \verb"\edef" with a bunch of
+\verb"\expandafter" commands inside. This posed a problem if the page number
+ itself contained code which needed protection (e.g., pr/4080) so this got
+ changed in the last release to use \verb"\protected@edef". However, that in turn failed with Babel
+(bug report/4093)   if the label contained active characters, e.g., a ``:'' in French. So now
+we use even more \verb"\expandafter" commands to avoid any expansion other
+ than what is absolutely  required---making the code in that space absolutely unreadable.
+\begin{verbatim}
+  \expandafter\expandafter\expandafter
+  \def\expandafter\expandafter\expandafter
+    #1\expandafter\expandafter\expandafter
+       {\expandafter\expandafter\expandafter
+         \@cdr\csname r@#2\endcsname
+         \@nil}%
+\end{verbatim}
+Code like this nicely demonstrates the limitations in the programming layer of \LaTeXe{} and the advantages that  \textsf{expl3} will offer on this level.
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.dtx b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
index ff9689d98b3..a35ac2baa4e 100644
--- a/Master/texmf-dist/source/latex/base/ltoutenc.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
@@ -44,7 +44,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltoutenc.dtx}
-             [2005/11/08 v1.99h LaTeX Kernel (font encodings)]
+             [2009/11/04 v1.99l LaTeX Kernel (font encodings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutenc.dtx}
@@ -65,7 +65,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{2788}
+% \CheckSum{2802}
 %
 % \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
@@ -3299,6 +3299,29 @@
 \DeclareEncodingSubset{TS1}{txtt}    {0}
 %    \end{macrocode}
 %
+%    Latin Modern and TeX Gyre:
+% \changes{v1.99k}{2009/10/28}{Added Latin Modern and TeX Gyre subsets}
+% \changes{v1.99l}{2009/11/04}{Added more Latin Modern and TeX Gyre subsets}
+%    \begin{macrocode}
+\DeclareEncodingSubset{TS1}{lmr}     {0}
+\DeclareEncodingSubset{TS1}{lmdh}    {0}
+\DeclareEncodingSubset{TS1}{lmss}    {0}
+\DeclareEncodingSubset{TS1}{lmssq}   {0}
+\DeclareEncodingSubset{TS1}{lmvtt}   {0}
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
+\DeclareEncodingSubset{TS1}{qhv}     {0}
+\DeclareEncodingSubset{TS1}{qag}     {0}
+\DeclareEncodingSubset{TS1}{qbk}     {0}
+\DeclareEncodingSubset{TS1}{qcr}     {0}
+\DeclareEncodingSubset{TS1}{qcs}     {0}
+\DeclareEncodingSubset{TS1}{qpl}     {0}
+\DeclareEncodingSubset{TS1}{qtm}     {0}
+\DeclareEncodingSubset{TS1}{qzc}     {0}
+\DeclareEncodingSubset{TS1}{qhvc}    {0}
+%    \end{macrocode}
+%
 %    Fourier-GUTenberg:
 %    \begin{macrocode}
 \DeclareEncodingSubset{TS1}{futs}    {4}
diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx
index e4f6ad304b9..77428b44bb9 100644
--- a/Master/texmf-dist/source/latex/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx
@@ -2994,8 +2994,8 @@
 % The star form of this command is dedicated to Leslie Lamport, the
 % other we need for ourselves (FMi, CAR).
 %
-% These commands may well have unwanted effects if used soon 
-% before a \clearpage: please give keep them clear of such places.
+% These commands may well have unwanted effects if used soon
+% before a |\clearpage|: please give keep them clear of such places.
 %
 %  \begin{macro}{\@kludgeins}
 % \changes{v0.1c}{1993/11/23}{Insert added}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index 8d04720c051..421063536d5 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2011
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file. 
 % 
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltvers.dtx}
-             [2009/09/24 v1.0l LaTeX Kernel (Version Info)]
+             [2011/06/27 v1.0m LaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltvers.dtx}
@@ -84,7 +84,7 @@
 %    \begin{macrocode}
 %<*2ekernel>
 \def\fmtname{LaTeX2e}
-\edef\fmtversion{2009/09/24}
+\edef\fmtversion{2011/06/27}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}