summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-13 23:44:10 +0000
committerKarl Berry <karl@freefriends.org>2013-05-13 23:44:10 +0000
commitc0dc062c01f14cacf38aee55437d0b97571c280a (patch)
tree4c41e475cbe374028a6f3d5f1df7cbc58e5ddc9d /Master
parent124b1ee0fde140a15f9965ea59a7138e0179fe9b (diff)
caption (13may13)
git-svn-id: svn://tug.org/texlive/trunk@30449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/caption/totalcount.pdfbin72013 -> 73857 bytes
-rw-r--r--Master/texmf-dist/source/latex/caption/totalcount.dtx49
-rw-r--r--Master/texmf-dist/tex/latex/caption/totalcount.sty30
3 files changed, 48 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/totalcount.pdf b/Master/texmf-dist/doc/latex/caption/totalcount.pdf
index 1c8cf7e0471..afe5b317c4f 100644
--- a/Master/texmf-dist/doc/latex/caption/totalcount.pdf
+++ b/Master/texmf-dist/doc/latex/caption/totalcount.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/caption/totalcount.dtx b/Master/texmf-dist/source/latex/caption/totalcount.dtx
index efc58d56cda..b4f84db7676 100644
--- a/Master/texmf-dist/source/latex/caption/totalcount.dtx
+++ b/Master/texmf-dist/source/latex/caption/totalcount.dtx
@@ -2,7 +2,7 @@
%
% This is file `totalcount.dtx'.
%
-% $Id: totalcount.dtx 90 2013-05-11 12:00:30Z sommerfeldt $
+% $Id: totalcount.dtx 93 2013-05-12 10:17:54Z sommerfeldt $
% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/totalcount.dtx $
%
% Copyright (C) 2010-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
@@ -25,12 +25,12 @@
% and the derived file totalcount.sty.
%
% \fi
-% \CheckSum{121}
+% \CheckSum{135}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{totalcount.drv}[2013/05/11 v1.0 Total values of counters]
+\ProvidesFile{totalcount.drv}[2013/05/12 v1.0 Total values of counters]
\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -124,7 +124,8 @@
% |\fi|
% \end{quote}
% \pagebreak[3]
-% This should work with other counters as well (for example |equation|),
+% This should work with other counters as well (for example |equation|,
+% or |lst|\-|listing| offered by the \package{listings} package~\cite{listings}),
% but please note that using the |page| counter here is not supported.
%
% \pagebreak[3]
@@ -132,7 +133,7 @@
% \begin{quote}
% |\DeclareTotalCounter|\marg{counter}
% \end{quote}
-% defines the commands |\total|\meta{counter}|s| and |\if|\-|total|\meta{counter}|s|.
+% actually defines the commands |\total|\meta{counter}|s| and |\if|\-|total|\meta{counter}|s|.
%
% \pagebreak[3]
% So in fact
@@ -182,6 +183,11 @@
%
% \StopEventually{%^^A
% \begin{thebibliography}{9}
+% \bibitem{listings}
+% Carsten Heinz \& Brooks Moses:\\
+% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/listings/}%
+% {\emph{The Listings Package}},\\
+% 2007/02/22
% \bibitem{xspace}
% David Carlisle and Morten H\o gholm:\\
% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/xspace/}%
@@ -257,23 +263,28 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{totalcount}[2008/03/09 v1.0 Total values of counters (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+ \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: totalcount.dtx 93 2013-05-12 10:17:54Z sommerfeldt $
+\ProvidesPackage{totalcount}[\caption@tempa v1.0-\caption@tempb Total values of counters (AR)]
% \end{macrocode}
%
% \subsection{Initial code}
%
% \begin{macro}{\DeclareTotalCounter}
+% \changes{v1.0}{2013/05/12}{Usage of \cs{totalcount@counters} delayed}
% |\DeclareTotalCounter|\marg{counter name}
% \begin{macrocode}
\newcommand*\DeclareTotalCounter[1]{%
- \@ifundefined{c@#1}%
+ \newcounter{totalcount@#1}%
+ \@namedef{total#1s}{\nfss@text{\reset@font\bfseries ??}}%
+ \@namedef{total#1es}{\@nameuse{total#1s}}%
+ \expandafter\newif\csname iftotal#1s\endcsname
+ \@namedef{iftotal#1es}{\@nameuse{iftotal#1s}}%
+% \@nameuse{totalcount@set@#1}%
+ \AtBeginDocument{\@ifundefined{c@#1}%
{\PackageError{totalcount}{Undefined counter `#1'}\@ehc}%
- {\newcounter{totalcount@#1}%
- \@namedef{total#1s}{\nfss@text{\reset@font\bfseries ??}}%
- \@namedef{total#1es}{\@nameuse{total#1s}}%
- \expandafter\newif\csname iftotal#1s\endcsname
- \@namedef{iftotal#1es}{\@nameuse{iftotal#1s}}%
- \@cons\totalcount@counters{{#1}}}}
+ {\@cons\totalcount@counters{{#1}}}}}
\@onlypreamble\DeclareTotalCounter
% \end{macrocode}
% \begin{macrocode}
@@ -325,11 +336,13 @@
% |\totalcount@set|\marg{counter name}\marg{value}
% \begin{macrocode}
\newcommand*\totalcount@set[2]{%
- \@ifundefined{c@totalcount@#1}{}{%
- \global\@namedef{total#1s}{#2\totalcount@xspace}%
- \ifnum#2=0\relax \else
- \global\@nameuse{total#1strue}%
- \fi}}
+ \@ifundefined{c@totalcount@#1}%
+% {\global\@namedef{totalcount@set@#1}{\totalcount@set{#1}{#2}}}%
+ {}%
+ {\global\@namedef{total#1s}{#2\totalcount@xspace}%
+ \ifnum#2=0\relax \else
+ \global\@nameuse{total#1strue}%
+ \fi}}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/tex/latex/caption/totalcount.sty b/Master/texmf-dist/tex/latex/caption/totalcount.sty
index e609df916cf..c8e6476021d 100644
--- a/Master/texmf-dist/tex/latex/caption/totalcount.sty
+++ b/Master/texmf-dist/tex/latex/caption/totalcount.sty
@@ -37,16 +37,19 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{totalcount}[2008/03/09 v1.0 Total values of counters (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+ \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: totalcount.sty 92 2013-05-12 09:06:59Z sommerfeldt $
+\ProvidesPackage{totalcount}[\caption@tempa v1.0-\caption@tempb Total values of counters (AR)]
\newcommand*\DeclareTotalCounter[1]{%
- \@ifundefined{c@#1}%
+ \newcounter{totalcount@#1}%
+ \@namedef{total#1s}{\nfss@text{\reset@font\bfseries ??}}%
+ \@namedef{total#1es}{\@nameuse{total#1s}}%
+ \expandafter\newif\csname iftotal#1s\endcsname
+ \@namedef{iftotal#1es}{\@nameuse{iftotal#1s}}%
+ \AtBeginDocument{\@ifundefined{c@#1}%
{\PackageError{totalcount}{Undefined counter `#1'}\@ehc}%
- {\newcounter{totalcount@#1}%
- \@namedef{total#1s}{\nfss@text{\reset@font\bfseries ??}}%
- \@namedef{total#1es}{\@nameuse{total#1s}}%
- \expandafter\newif\csname iftotal#1s\endcsname
- \@namedef{iftotal#1es}{\@nameuse{iftotal#1s}}%
- \@cons\totalcount@counters{{#1}}}}
+ {\@cons\totalcount@counters{{#1}}}}}
\@onlypreamble\DeclareTotalCounter
\let\totalcount@counters\@empty
\newcommand*\totalcount@xspace{}
@@ -64,11 +67,12 @@
\totalcount@addtocounter{#1}%
\totalcount@stpelt@ORI{#1}}
\newcommand*\totalcount@set[2]{%
- \@ifundefined{c@totalcount@#1}{}{%
- \global\@namedef{total#1s}{#2\totalcount@xspace}%
- \ifnum#2=0\relax \else
- \global\@nameuse{total#1strue}%
- \fi}}
+ \@ifundefined{c@totalcount@#1}%
+ {}%
+ {\global\@namedef{total#1s}{#2\totalcount@xspace}%
+ \ifnum#2=0\relax \else
+ \global\@nameuse{total#1strue}%
+ \fi}}
\AtBeginDocument{\AtEndDocument{%
\begingroup
\@tempswafalse