apxproof (15dec16)

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

3 files changed, 19 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/apxproof/apxproof.pdf b/Master/texmf-dist/doc/latex/apxproof/apxproof.pdf
index cb2849b1017..47177046aa5 100644
--- a/Master/texmf-dist/doc/latex/apxproof/apxproof.pdf
+++ b/Master/texmf-dist/doc/latex/apxproof/apxproof.pdf
diff --git a/Master/texmf-dist/source/latex/apxproof/apxproof.dtx b/Master/texmf-dist/source/latex/apxproof/apxproof.dtx
index ac3ac109b81..1ac32c3b48b 100644
--- a/Master/texmf-dist/source/latex/apxproof/apxproof.dtx
+++ b/Master/texmf-dist/source/latex/apxproof/apxproof.dtx
@@ -24,7 +24,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{apxproof}
-%<package>  [2016/11/07 v1.0.1 Automatic proofs in appendix]
+%<package>  [2016/12/13 v1.0.2 Automatic proofs in appendix]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -44,7 +44,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{444}
+% \CheckSum{445}
 %
 % \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
@@ -524,13 +524,17 @@ This is a citation in the appendix~\cite{proofsAreHard}.
 %    \end{macrocode}
 % \end{environment}  
 % \begin{macro}{\thmhead}  
+% \changes{v1.0.2}{2016/12/13}{Fix display of repeated theorem counter in
+% some document classes}
 % We redefine AMS-\LaTeX{}'s |\thmhead| to use a format where the
 % repeated version of a theorem, using a theorem note, can look exactly
 % like the original version of the theorem and its theorem counter.
 %    \begin{macrocode}
-\def\thmhead#1#2#3{%
-  \thmname{#1}\thmnumber{\@ifnotempty{#1}{ }\@upn{#2}}%
-  \thmnote{ #3}}
+\AtBeginDocument{%
+  \def\thmhead#1#2#3{%
+    \thmname{#1}\thmnumber{\@ifnotempty{#1}{ }\@upn{#2}}%
+    \thmnote{ #3}}%
+}
 %    \end{macrocode}
 % \end{macro}  
 % \begin{macro}{\appendixrefname}
@@ -732,12 +736,14 @@ This is a citation in the appendix~\cite{proofsAreHard}.
 % and a reference to the previously defined label.
 % We ignore any use of |\label| in this environment to avoid multiply
 % defined labels.
+% \changes{v1.0.2}{2016/12/13}{Fix missing space between repeated theorem
+% counter and theorem note}
 %    \begin{macrocode}  
       \axp@writesection%
       \immediate\write\axp@proofsfile{%
         \noexpand\begin{axp@#1rp}
           [\noexpand\ref{axp@r\roman{axp@rpcounter}}%
-           \@ifnotempty{##1}{\noexpand##1}]%
+           \@ifnotempty{##1}{ \noexpand##1}]%
           \noexpand\let\noexpand\label\noexpand\@gobble%
           \expandafter\noexpand\csname rplet\roman{axp@rpcounter}%
                                \endcsname
diff --git a/Master/texmf-dist/tex/latex/apxproof/apxproof.sty b/Master/texmf-dist/tex/latex/apxproof/apxproof.sty
index 9fcaa834947..6168172238d 100644
--- a/Master/texmf-dist/tex/latex/apxproof/apxproof.sty
+++ b/Master/texmf-dist/tex/latex/apxproof/apxproof.sty
@@ -27,7 +27,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{apxproof}
-  [2016/11/07 v1.0.1 Automatic proofs in appendix]
+  [2016/12/13 v1.0.2 Automatic proofs in appendix]
 \RequirePackage{bibunits}
 \RequirePackage{environ}
 \RequirePackage{etoolbox}
@@ -63,9 +63,11 @@
 \newenvironment{proofsketch}
   {\vskip3pt\noindent\textit{Proof sketch.} \upshape}
   {\hfill\qed\vskip3pt}
-\def\thmhead#1#2#3{%
-  \thmname{#1}\thmnumber{\@ifnotempty{#1}{ }\@upn{#2}}%
-  \thmnote{ #3}}
+\AtBeginDocument{%
+  \def\thmhead#1#2#3{%
+    \thmname{#1}\thmnumber{\@ifnotempty{#1}{ }\@upn{#2}}%
+    \thmnote{ #3}}%
+}
 \newcommand{\appendixrefname}{References for the Appendix}
 \newcommand{\appendixbibliographystyle}{alpha}
 \newcommand{\appendixbibliographyprelim}{}
@@ -144,7 +146,7 @@
       \immediate\write\axp@proofsfile{%
         \noexpand\begin{axp@#1rp}
           [\noexpand\ref{axp@r\roman{axp@rpcounter}}%
-           \@ifnotempty{##1}{\noexpand##1}]%
+           \@ifnotempty{##1}{ \noexpand##1}]%
           \noexpand\let\noexpand\label\noexpand\@gobble%
           \expandafter\noexpand\csname rplet\roman{axp@rpcounter}%
                                \endcsname