texlive[42453] Master/texmf-dist: apxproof (7nov16)

commits+karl at tug.org commits+karl at tug.org
Mon Nov 7 23:14:47 CET 2016


Revision: 42453
          http://tug.org/svn/texlive?view=revision&revision=42453
Author:   karl
Date:     2016-11-07 23:14:47 +0100 (Mon, 07 Nov 2016)
Log Message:
-----------
apxproof (7nov16)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/apxproof/Makefile
    trunk/Master/texmf-dist/doc/latex/apxproof/README.md
    trunk/Master/texmf-dist/doc/latex/apxproof/apxproof.pdf
    trunk/Master/texmf-dist/source/latex/apxproof/apxproof.dtx
    trunk/Master/texmf-dist/tex/latex/apxproof/apxproof.sty

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/Makefile
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/article/
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.bib
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.tex
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/inline/
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/lipics/
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/llncs/
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/scrartcl/
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/sig-alternate/
    trunk/Master/texmf-dist/doc/latex/apxproof/examples/strip/

Modified: trunk/Master/texmf-dist/doc/latex/apxproof/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apxproof/Makefile	2016-11-07 21:46:14 UTC (rev 42452)
+++ trunk/Master/texmf-dist/doc/latex/apxproof/Makefile	2016-11-07 22:14:47 UTC (rev 42453)
@@ -3,6 +3,9 @@
 clean:
 	-rm -f *.aux *.log *.gl? *.idx *.ilg *.fls *.ind *.axp *.bbl *.blg *.hd  *.out
 
+ctan:
+	git archive --format zip master --prefix=apxproof/  --output apxproof.zip
+
 %.pdf: %.dtx %.sty
 	pdflatex $<
 	makeindex -s gind.ist $(patsubst %.pdf,%.idx,$@)

Modified: trunk/Master/texmf-dist/doc/latex/apxproof/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apxproof/README.md	2016-11-07 21:46:14 UTC (rev 42452)
+++ trunk/Master/texmf-dist/doc/latex/apxproof/README.md	2016-11-07 22:14:47 UTC (rev 42453)
@@ -2,10 +2,18 @@
 
 ## About
 
-The `apxproof` package facilitates the writing of scientific article
-with proofs deferred to the appendix. The documentation of this package
-is provided in the [apxproof.pdf](apxproof.pdf) file.
+The `apxproof` package makes it easier to write articles where proofs and
+other material are deferred to the appendix. The appendix material is
+written in the LaTeX code along with the main text which it naturally
+complements, and it is automatically deferred. The package can
+automatically send proofs to the appendix, can repeat in the appendix the
+theorem environments stated in the main text, can section the appendix
+automatically based on the sectioning of the main text, and supports a
+separate bibliography for the appendix material.
 
+The documentation of this package is provided in the
+[apxproof.pdf](apxproof.pdf) file.
+
 ## Prerequisites
 
 In addition to a working installation of LaTeX2e, `apxproof` relies on a

Modified: trunk/Master/texmf-dist/doc/latex/apxproof/apxproof.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/latex/apxproof/examples/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apxproof/examples/Makefile	2016-11-07 21:46:14 UTC (rev 42452)
+++ trunk/Master/texmf-dist/doc/latex/apxproof/examples/Makefile	2016-11-07 22:14:47 UTC (rev 42453)
@@ -1,12 +0,0 @@
-TARGET = $(foreach dir, $(wildcard */), $(dir)/test.pdf)
-
-all: $(TARGET)
-
-clean:
-	rm */*.aux */*.blg */*.bbl */*.axp */*.fls */*.fdb* */*.log */*.out
-
-%.pdf: %.tex ../apxproof.sty common.tex common.bib
-	cd $(dir $@) && \
-	latexmk -c && \
-	latexmk test ; \
-	cd ..

Deleted: trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.bib	2016-11-07 21:46:14 UTC (rev 42452)
+++ trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.bib	2016-11-07 22:14:47 UTC (rev 42453)
@@ -1,19 +0,0 @@
- at Article{	  brin1998anatomy,
-  author	= "Sergey Brin and Lawrence Page",
-  title		= "The anatomy of a large-scale hypertextual {Web} search
-		  engine",
-  journal	= "Computer Networks",
-  volume	= "30",
-  number	= "1--7",
-  pages		= "107--117",
-  year		= "1998",
-  month		= apr
-}
-
- at Misc{		  sitemaps,
-  author	= {{sitemaps.org}},
-  howpublished	= {\url{http://www.sitemaps.org/protocol.php}},
-  year		= 2008,
-  month		= feb,
-  title		= {Sitemaps {XML} format}
-}

Deleted: trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.tex	2016-11-07 21:46:14 UTC (rev 42452)
+++ trunk/Master/texmf-dist/doc/latex/apxproof/examples/common.tex	2016-11-07 22:14:47 UTC (rev 42453)
@@ -1,134 +0,0 @@
-\usepackage{hyperref}
-
-\newtheoremrep{theorem}{Theorem}
-\newtheoremrep{lemma}{Lemma}
-
-\renewcommand{\appendixsectionformat}[2]{Material for #2 (Section~#1)}
-
-\begin{document}
-Hello world!
-
-\begin{theoremrep}
-  \label{th:toto}
-  This is a great result.
-\end{theoremrep}
-
-\begin{proofsketch}
-  This is the proof sketch of Theorem~\ref{th:toto}.
-\end{proofsketch}
-
-\begin{proof}
-  This is the proof of Theorem~\ref{th:toto}.
-\end{proof}
-
-\section{Section without Theorems}
-
-Since this section does not have any appendix content, it will not appear in the
-appendix. \cite{brin1998anatomy}
-
-\section{Section with Some Appendix Content}
-
-Not much in the main text.
-
-\begin{toappendix}
-  Hello appendix!
-\end{toappendix}
-
-\section{Section with Theorems}
-
-\begin{theoremrep}
-  \label{th:titi}
-  Another great result.
-\end{theoremrep}
-
-\begin{proofsketch}
-  Proof sketch of Theorem~\ref{th:titi}.
-\end{proofsketch}
-
-\begin{proof}
-  Proof of Theorem~\ref{th:titi}.
-
-  For some reason, this proof has an inline Lemma:
-  \begin{lemma}
-    This is the lemma.
-  \end{lemma} 
-
-  \begin{nestedproof}
-    And this lemma has a proof as well!
-  \end{nestedproof}
-
-  This concludes the global proof of Theorem~\ref{th:titi}.
-\end{proof}
-
-\begin{theoremrep}
-  \label{th:tutu}
-  Another great result, without any proof sketch.
-\end{theoremrep}
-
-\begin{proof}
-  Proof of Theorem~\ref{th:tutu}. It has two
-  references~\cite{sitemaps,brin1998anatomy}.
-\end{proof}
-
-\begin{theorem}
-  A regular theorem, not repeated.
-\end{theorem}
-
-\begin{proof}
-This regular theorem is naturally followed with an inline proof.
-\end{proof}
-
-\begin{theoremrep}
-  \label{th:weird}
-  A repeated theorem, but with two proofs, one in Appendix and one in
-  main text.
-\end{theoremrep}
-
-\begin{inlineproof}
-  Main text proof of Theorem~\ref{th:weird}.
-\end{inlineproof}
-
-\begin{proof}
-  Appendix proof of Theorem~\ref{th:weird}.
-\end{proof}
-
-\begin{toappendix}
-And now for no particular reason, two isolated proofs in the appendix,
-  written in two different ways:
-
-  \begin{proof}[Proof of a non-existing result]
-    First with a regular \texttt{proof} environment inside a
-    \texttt{toappendix} environment.
-  \end{proof}
-\end{toappendix}
-
-\begin{appendixproof}
-  Second, with the specific \texttt{appendixproof} environment (but then,
-  cannot change the proof name).
-\end{appendixproof}
-
-\section{Last Section}
-
-\begin{theoremrep}
-  Another theorem.
-\end{theoremrep}
-
-\begin{toappendix}
-  This theorem does not have a proof, but a discussion in the appendix.
-  \textsf{apxproof} can figure, because of the \verb|theorem| environment
-  that follows, that the proof of the following theorem is not a proof of
-  this theorem.
-\end{toappendix}
-
-\begin{theorem}
-  Last theorem, not repeated.
-\end{theorem}
-
-\begin{proof}
-  Proof, inlined.
-\end{proof}
-
-\bibliographystyle{plain}
-\bibliography{../common}
-
-\end{document}

Modified: trunk/Master/texmf-dist/source/latex/apxproof/apxproof.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/apxproof/apxproof.dtx	2016-11-07 21:46:14 UTC (rev 42452)
+++ trunk/Master/texmf-dist/source/latex/apxproof/apxproof.dtx	2016-11-07 22:14:47 UTC (rev 42453)
@@ -24,7 +24,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{apxproof}
-%<package>  [2016/10/31 v1.0.0 Automatic proofs in appendix]
+%<package>  [2016/11/07 v1.0.1 Automatic proofs in appendix]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -44,7 +44,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{433}
+% \CheckSum{444}
 %
 % \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
@@ -63,6 +63,8 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \changes{v1.0.0}{2016/10/31}{Initial released version}
+% \changes{v1.0.1}{2016/11/07}{Prevent empty bibliography environment;
+% fix typos}
 % 
 % \GetFileInfo{apxproof.sty}
 %
@@ -89,7 +91,7 @@
 % This package makes it easier to write articles where proofs and other material
 % are deferred to the appendix. The appendix material is written in the \LaTeX{}
 % code along with the main text which it naturally complements, and it is
-% automatically deferred. The package can automatically send proofs in the
+% automatically deferred. The package can automatically send proofs to the
 % appendix, can repeat in the appendix the theorem environments stated in the
 % main text, can section the appendix automatically based on the sectioning of
 % the main text, and supports a separate bibliography for the appendix material.
@@ -169,7 +171,7 @@
 % theorem, \meta{counter} (e.g., |definition|) is an optional counter describing
 % from which kind of enviroment should the numbering of these environments be
 % inherited, and \meta{title}
-% (e.g., |Theorem| is
+% (e.g., |Theorem|) is
 % the title that will be used to display this theorem environment. What
 % differs from |\newtheorem| is that, when the following is written:
 % \begin{quote}
@@ -926,7 +928,8 @@
 % \end{macro}
 % After the end of the main text, we add the appendix (on a new page, set
 % in single-column mode) within a |bibunit| environment so as to typeset
-% a separate bibliography for the appendix.
+% a separate bibliography for the appendix. There is an extra test to
+% ensure an empty bibliography environment is not produced.
 %    \begin{macrocode}
     \AtEndDocument{
       \clearpage\onecolumn\appendix
@@ -934,6 +937,9 @@
         \immediate\closeout\axp at proofsfile
         \input{\jobname.axp}
         \renewcommand{\refname}{\appendixrefname}
+        \let\axp at oldthebibliography\thebibliography
+        \renewcommand\thebibliography[1]{%
+          \ifx\relax#1\relax\else\axp at oldthebibliography{#1}\fi}
         \appendixbibliographyprelim
         \putbib
       \end{bibunit}

Modified: trunk/Master/texmf-dist/tex/latex/apxproof/apxproof.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apxproof/apxproof.sty	2016-11-07 21:46:14 UTC (rev 42452)
+++ trunk/Master/texmf-dist/tex/latex/apxproof/apxproof.sty	2016-11-07 22:14:47 UTC (rev 42453)
@@ -27,7 +27,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{apxproof}
-  [2016/10/31 v1.0.0 Automatic proofs in appendix]
+  [2016/11/07 v1.0.1 Automatic proofs in appendix]
 \RequirePackage{bibunits}
 \RequirePackage{environ}
 \RequirePackage{etoolbox}
@@ -244,6 +244,9 @@
         \immediate\closeout\axp at proofsfile
         \input{\jobname.axp}
         \renewcommand{\refname}{\appendixrefname}
+        \let\axp at oldthebibliography\thebibliography
+        \renewcommand\thebibliography[1]{%
+          \ifx\relax#1\relax\else\axp at oldthebibliography{#1}\fi}
         \appendixbibliographyprelim
         \putbib
       \end{bibunit}



More information about the tex-live-commits mailing list