tocvsec2 (10mar14)

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

4 files changed, 58 insertions, 51 deletions

diff --git a/Master/texmf-dist/doc/latex/tocvsec2/README b/Master/texmf-dist/doc/latex/tocvsec2/README
index a3e5ad6338f..382611626fb 100644
--- a/Master/texmf-dist/doc/latex/tocvsec2/README
+++ b/Master/texmf-dist/doc/latex/tocvsec2/README
@@ -8,6 +8,10 @@ NB. The package also requires the ifthen package.
 ______________
 Change history
 
+version 1.3a (2014/03/10)
+- Missing % in a definition was causing a spacing issue.
+  Thanks: http://tex.stackexchange.com/a/164612
+
 version 1.3 (2011/08/07)
 - New commands \resettocdepth and \resetsecnumdepth
   used for resetting to previous values of the tocdepth
@@ -16,7 +20,7 @@ version 1.3 (2011/08/07)
   `max' values.
 
 - Bug fix that resets "tocdepth" to its original value after
-  the \tableofcontents -- els it will adversely affect
+  the \tableofcontents -- else it will adversely affect
   subsequent List of Figures/Tables (or cause no harm,
   either way).
 
diff --git a/Master/texmf-dist/doc/latex/tocvsec2/tocvsec2.pdf b/Master/texmf-dist/doc/latex/tocvsec2/tocvsec2.pdf
index 7977c890f8d..fe6e8d87a93 100644
--- a/Master/texmf-dist/doc/latex/tocvsec2/tocvsec2.pdf
+++ b/Master/texmf-dist/doc/latex/tocvsec2/tocvsec2.pdf
diff --git a/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx b/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx
index 5d47eb29e29..c40a36b018b 100644
--- a/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx
+++ b/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx
@@ -22,7 +22,7 @@
 %</driver>
 %<usc>\ProvidesPackage{tocvsec2}
 %<*usc>
-    [2011/08/07 v1.3 variable ToC section entries]    
+    [2014/03/10 v1.3a variable ToC section entries]    
 %</usc>
 % 
 %<*driver>
@@ -86,6 +86,7 @@
 % \changes{v1.1a}{2004/05/10}{Changed license from LPPL v1.0 to v1.3}
 % \changes{v1.2}{2004/05/24}{Eliminated requirement for stdclsdv package}
 % \changes{v1.2a}{2009/09/04}{New maintainer (Will Robertson)}
+% \changes{v1.3a}{2011/03/10}{Some missing comment chars causing space issues}
 %
 % \def\dtxfile{tocvsec2.dtx}
 % \GetFileInfo{\dtxfile}
@@ -375,36 +376,36 @@
 % \Lcount{counter} to the level of \meta{sec}.
 %    \begin{macrocode}
 \newif\if@knownsect@c
-\newcommand{\@setseccntt@c}[2]{
+\newcommand{\@setseccntt@c}[2]{%
   \@knownsect@cfalse
   \ifthenelse{\equal{#1}{none}}{\setcounter{#2}{-10}
-                                \@knownsect@ctrue}{}
+                                \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{part}}{\ift@cchapter
                                   \setcounter{#2}{-1} 
                                 \else
                                   \setcounter{#2}{0}
                                 \fi
-                                \@knownsect@ctrue}{}
+                                \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{chapter}}{\setcounter{#2}{0}
-                                   \@knownsect@ctrue}{}
+                                   \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{section}}{\setcounter{#2}{1}
-                                   \@knownsect@ctrue}{}
+                                   \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subsection}}{\setcounter{#2}{2}
-                                      \@knownsect@ctrue}{}
+                                      \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subsubsection}}{\setcounter{#2}{3}
-                                         \@knownsect@ctrue}{}
+                                         \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{paragraph}}{\setcounter{#2}{4}
-                                     \@knownsect@ctrue}{}
+                                     \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subparagraph}}{\setcounter{#2}{5}
-                                        \@knownsect@ctrue}{}
+                                        \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{all}}{\setcounter{#2}{100}
-                                \@knownsect@ctrue}{}
+                                \@knownsect@ctrue}{}%
   \if@knownsect@c\else
     \PackageError{tocvsec2}{%
       Unknown sectioning command name (#1)
     }{%
       I'll ignore it. Type \space <return> and I'll continue.\MessageBreak
-      If you haven't mistyped the name then use \protect\setcounter\space instead.}
+      If you haven't mistyped the name then use \protect\setcounter\space instead.}%
   \fi
 }
 %    \end{macrocode}
@@ -421,39 +422,39 @@
   \@knownsect@cfalse
   \ifthenelse{\equal{#1}{none}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{-10}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{part}}{%
     \ift@cchapter
       \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{-1}}
     \else
       \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{0}}
     \fi
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{chapter}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{0}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{section}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{1}}
-    \@knownsect@ctrue}{}
-  \ifthenelse{\equal{#1}{subsection}}{
+    \@knownsect@ctrue}{}%
+  \ifthenelse{\equal{#1}{subsection}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{2}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subsubsection}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{3}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{paragraph}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{4}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subparagraph}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{5}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{all}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{100}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \if@knownsect@c\else
     \PackageError{tocvsec2}{%
       Unknown sectioning command name (#1)}%
-     {I'll ignore it. Type \space <return> and I'll continue.}
+     {I'll ignore it. Type \space <return> and I'll continue.}%
   \fi
 }
 %    \end{macrocode}
@@ -491,7 +492,8 @@
 %    \begin{macrocode}
 \newcommand{\setsecnumdepth}[1]{%
   \save@secnumdepth
-  \@setseccntt@c{#1}{secnumdepth}}
+  \@setseccntt@c{#1}{secnumdepth}%
+}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -543,7 +545,7 @@
       \afterassignment\gobble@secnumdepth
       \expandafter\c@secnumdepth\expandafter\numexpr\stack@secnumdepth\@nil
     \fi
-  }
+  }%
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty b/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty
index 8c90735738a..659a164dbff 100644
--- a/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty
+++ b/Master/texmf-dist/tex/latex/tocvsec2/tocvsec2.sty
@@ -23,7 +23,7 @@
 %%   This work consists of the files listed in the README file.
 %% -----------------------------------------------------------------
 \ProvidesPackage{tocvsec2}
-    [2011/08/07 v1.3 variable ToC section entries]
+    [2014/03/10 v1.3a variable ToC section entries]
 \RequirePackage{ifthen}
 \newif\ift@cchapter
   \t@cchapterfalse
@@ -34,75 +34,75 @@
   {\t@cchaptertrue}
 
 \newif\if@knownsect@c
-\newcommand{\@setseccntt@c}[2]{
+\newcommand{\@setseccntt@c}[2]{%
   \@knownsect@cfalse
   \ifthenelse{\equal{#1}{none}}{\setcounter{#2}{-10}
-                                \@knownsect@ctrue}{}
+                                \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{part}}{\ift@cchapter
                                   \setcounter{#2}{-1}
                                 \else
                                   \setcounter{#2}{0}
                                 \fi
-                                \@knownsect@ctrue}{}
+                                \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{chapter}}{\setcounter{#2}{0}
-                                   \@knownsect@ctrue}{}
+                                   \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{section}}{\setcounter{#2}{1}
-                                   \@knownsect@ctrue}{}
+                                   \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subsection}}{\setcounter{#2}{2}
-                                      \@knownsect@ctrue}{}
+                                      \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subsubsection}}{\setcounter{#2}{3}
-                                         \@knownsect@ctrue}{}
+                                         \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{paragraph}}{\setcounter{#2}{4}
-                                     \@knownsect@ctrue}{}
+                                     \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subparagraph}}{\setcounter{#2}{5}
-                                        \@knownsect@ctrue}{}
+                                        \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{all}}{\setcounter{#2}{100}
-                                \@knownsect@ctrue}{}
+                                \@knownsect@ctrue}{}%
   \if@knownsect@c\else
     \PackageError{tocvsec2}{%
       Unknown sectioning command name (#1)
     }{%
       I'll ignore it. Type \space <return> and I'll continue.\MessageBreak
-      If you haven't mistyped the name then use \protect\setcounter\space instead.}
+      If you haven't mistyped the name then use \protect\setcounter\space instead.}%
   \fi
 }
 \newcommand{\settocdepth}[1]{%
   \@knownsect@cfalse
   \ifthenelse{\equal{#1}{none}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{-10}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{part}}{%
     \ift@cchapter
       \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{-1}}
     \else
       \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{0}}
     \fi
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{chapter}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{0}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{section}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{1}}
-    \@knownsect@ctrue}{}
-  \ifthenelse{\equal{#1}{subsection}}{
+    \@knownsect@ctrue}{}%
+  \ifthenelse{\equal{#1}{subsection}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{2}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subsubsection}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{3}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{paragraph}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{4}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{subparagraph}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{5}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \ifthenelse{\equal{#1}{all}}{%
     \addtocontents{toc}{\save@tocdepth\protect\setcounter{tocdepth}{100}}
-    \@knownsect@ctrue}{}
+    \@knownsect@ctrue}{}%
   \if@knownsect@c\else
     \PackageError{tocvsec2}{%
       Unknown sectioning command name (#1)}%
-     {I'll ignore it. Type \space <return> and I'll continue.}
+     {I'll ignore it. Type \space <return> and I'll continue.}%
   \fi
 }
 \newcounter{max@tocdepth}
@@ -117,7 +117,8 @@
 }
 \newcommand{\setsecnumdepth}[1]{%
   \save@secnumdepth
-  \@setseccntt@c{#1}{secnumdepth}}
+  \@setseccntt@c{#1}{secnumdepth}%
+}
 \newcounter{max@secnumdepth}
 \setcounter{max@secnumdepth}{\value{secnumdepth}}
 \newcommand{\maxsecnumdepth}[1]{%
@@ -141,7 +142,7 @@
       \afterassignment\gobble@secnumdepth
       \expandafter\c@secnumdepth\expandafter\numexpr\stack@secnumdepth\@nil
     \fi
-  }
+  }%
 }
 \let\stack@tocdepth\@empty
 \protected\def\save@tocdepth{%