diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/totcount/README | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/totcount/totcount-ex.tex | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/totcount/totcount.pdf | bin | 198384 -> 285542 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/totcount/totcount.drv | 33 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/totcount/totcount.dtx | 91 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/totcount/totcount.ins | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/totcount/totcount.sty | 14 |
7 files changed, 103 insertions, 57 deletions
diff --git a/Master/texmf-dist/doc/latex/totcount/README b/Master/texmf-dist/doc/latex/totcount/README index df494f50e4e..6d5bd81556a 100644 --- a/Master/texmf-dist/doc/latex/totcount/README +++ b/Master/texmf-dist/doc/latex/totcount/README @@ -1,8 +1,8 @@ =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -The TotCount package, version 1.1, 2009/07/09 +The TotCount package, version 1.2, 2009/07/09 -Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@cs.tcd.ie) +Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@scss.tcd.ie) This program may be re-distributed and/or modified under the terms of the LaTeX Project Public License version 1.3c, or any later version. @@ -39,7 +39,7 @@ simply using standard LaTeX counters. 2. To compile the documentation run pdflatex totcount.drv - makeindex -s gind.ist totcount + makeindex -s gind.ist totcount.idx makeindex -s gglo.ist -o totcount.gls totcount.glo pdflatex totcount.drv diff --git a/Master/texmf-dist/doc/latex/totcount/totcount-ex.tex b/Master/texmf-dist/doc/latex/totcount/totcount-ex.tex index d4f8cff1c08..a7ba1006bc1 100644 --- a/Master/texmf-dist/doc/latex/totcount/totcount-ex.tex +++ b/Master/texmf-dist/doc/latex/totcount/totcount-ex.tex @@ -6,18 +6,18 @@ %% %% totcount.dtx (with options: `ex') %% -%% The TotCount package, version 1.0, 2009/04/14 +%% The TotCount package, version 1.2, 2011/01/25 %% -%% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@cs.tcd.ie) +%% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@scss.tcd.ie) %% %% This program may be re-distributed and/or modified under the terms of the %% LaTeX Project Public License version 1.3c, or any later version. %% The latest version of this license is in %% CTAN:macros/latex/base/lppl.txt %% -\def\totcfileversion{1.1} -\def\totcfiledate{2009/07/09} -\def\totcdocdate{9 Jul 2009} +\def\totcfileversion{1.2} +\def\totcfiledate{2011/01/25} +\def\totcdocdate{25 Jan 2011} \NeedsTeXFormat{LaTeX2e} \ProvidesFile{totcount-ex.tex} [\totcfiledate \space v\totcfileversion \space% diff --git a/Master/texmf-dist/doc/latex/totcount/totcount.pdf b/Master/texmf-dist/doc/latex/totcount/totcount.pdf Binary files differindex 87a163432ac..d206469aee5 100644 --- a/Master/texmf-dist/doc/latex/totcount/totcount.pdf +++ b/Master/texmf-dist/doc/latex/totcount/totcount.pdf diff --git a/Master/texmf-dist/source/latex/totcount/totcount.drv b/Master/texmf-dist/source/latex/totcount/totcount.drv index b804f428a48..f4d2ff2f440 100644 --- a/Master/texmf-dist/source/latex/totcount/totcount.drv +++ b/Master/texmf-dist/source/latex/totcount/totcount.drv @@ -6,22 +6,39 @@ %% %% totcount.dtx (with options: `drv') %% -%% The TotCount package, version 1.0, 2009/04/14 +%% The TotCount package, version 1.2, 2011/01/25 %% -%% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@cs.tcd.ie) +%% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@scss.tcd.ie) %% %% This program may be re-distributed and/or modified under the terms of the %% LaTeX Project Public License version 1.3c, or any later version. %% The latest version of this license is in %% CTAN:macros/latex/base/lppl.txt %% -\def\totcfileversion{1.1} -\def\totcfiledate{2009/07/09} -\def\totcdocdate{9 Jul 2009} +\def\totcfileversion{1.2} +\def\totcfiledate{2011/01/25} +\def\totcdocdate{25 Jan 2011} \NeedsTeXFormat{LaTeX2e} +%% \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 +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% \ProvidesFile{totcount.drv} [\totcfiledate \space v\totcfileversion \space Driver for the TotCount package] \documentclass{ltxdoc} +\CheckSum{217} \RequirePackage{hypdoc} \RequirePackage{tocloft} \renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}} @@ -30,15 +47,17 @@ \RequirePackage{totcount} \EnableCrossrefs \CodelineIndex -\setcounter{IndexColumns}{2} +\setcounter{IndexColumns}{1} \RecordChanges +\setlength\hfuzz{15pt} % dont make so many +\hbadness=7000 % over and under full \box warnings \newcommand*{\CTAN}[1]{% \href{http://www.ctan.org/tex-archive/#1}{\nolinkurl{CTAN:#1}}} \urldef\totcounturl\nolinkurl{CTAN:macros/latex/contrib/totcount/} \def\CTANtotcount{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/totcount/}{\totcounturl}} \newcommand*{\xpackage}[1]{\textsf{#1}} \begin{document} - \DocInput{totcount.dtx} \PrintIndex \PrintChanges + \DocInput{totcount.dtx} \end{document} \endinput %% diff --git a/Master/texmf-dist/source/latex/totcount/totcount.dtx b/Master/texmf-dist/source/latex/totcount/totcount.dtx index 21433e0e002..dd0558efa33 100644 --- a/Master/texmf-dist/source/latex/totcount/totcount.dtx +++ b/Master/texmf-dist/source/latex/totcount/totcount.dtx @@ -1,13 +1,31 @@ -\def\totcfileversion{1.1} -\def\totcfiledate{2009/07/09} -\def\totcdocdate{9 Jul 2009} +\def\totcfileversion{1.2} +\def\totcfiledate{2011/01/25} +\def\totcdocdate{25 Jan 2011} % ^^A********************************************************************** % \iffalse \NeedsTeXFormat{LaTeX2e} %<*drv> +%% \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 +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +% \ProvidesFile{totcount.drv} [\totcfiledate \space v\totcfileversion \space Driver for the TotCount package] \documentclass{ltxdoc} +\CheckSum{217} \RequirePackage{hypdoc} \RequirePackage{tocloft} % use leader dots with section headers (by default, only the subsections had them @@ -17,16 +35,18 @@ \RequirePackage{totcount} \EnableCrossrefs \CodelineIndex -\setcounter{IndexColumns}{2} +\setcounter{IndexColumns}{1} \RecordChanges -%\OnlyDescription % comment out for hiding implementation details +%\OnlyDescription % uncomment for hiding implementation details +\setlength\hfuzz{15pt} % dont make so many +\hbadness=7000 % over and under full \box warnings \newcommand*{\CTAN}[1]{% \href{http://www.ctan.org/tex-archive/#1}{\nolinkurl{CTAN:#1}}} \urldef\totcounturl\nolinkurl{CTAN:macros/latex/contrib/totcount/} \def\CTANtotcount{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/totcount/}{\totcounturl}} \newcommand*{\xpackage}[1]{\textsf{#1}} \begin{document} - \DocInput{totcount.dtx} \PrintIndex \PrintChanges + \DocInput{totcount.dtx} \end{document} %</drv> % @@ -34,7 +54,7 @@ % % The TotCount package, version \totcfileversion, \totcfiledate % -% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@cs.tcd.ie) +% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@scss.tcd.ie) % % This program may be re-distributed and/or modified under the terms of the % LaTeX Project Public License version 1.3c, or any later version. @@ -43,29 +63,28 @@ % % \fi % -% \changes{v1.1}{2009/07/09}{Fixes bug that mistakenly sets the date of any document using totcount} +% \changes{v1.1}{2009/07/09}{Fixes bug that mistakenly sets the date of any +% document using totcount} % \changes{v1.0}{2009/04/10}{First release} % % \MakeShortVerb{\|} % -% % \DoNotIndex{\@ifnextchar,\@mainaux,\csname,\newcommand} % \DoNotIndex{\def,\else,\endcsname,\expandafter} % \DoNotIndex{\fi,\gdef,\ifnum,\ifx,\immediate,\documentclass} % \DoNotIndex{\newwrite,\number,\begin,\section,\tt} % \DoNotIndex{\relax,\sp,\space,\string,\end,\let} % -% % \title{The \xpackage{totcount} package^^A % \thanks{Available at \CTANtotcount.}} -% \author{Vasileios Koutavas\\\normalsize\texttt{Vasileios.Koutavas@cs.tcd.ie}} +% \author{Vasileios Koutavas\\\normalsize\texttt{Vasileios.Koutavas@scss.tcd.ie}} % \date{\totcdocdate} % % \maketitle % % \begin{abstract} % This is the documentation for the \xpackage{totcount} package, a package for -% computing and displaying the value that was assigned last to counters inside +% computing and displaying the last value assigned to counters inside % a document. With this package one may count the total number of elements % (e.g. sections, pages, citations, etc.) in a \LaTeX\ document by simply using % standard \LaTeX\ counters. @@ -88,24 +107,24 @@ % \section{Introduction} % % Referring to the total number of sections, pages, citations, list items, or -% anything else in a document can be difficult to achieve. The difficulty comes -% when the reference is \emph{before} the definition of all the elements that -% need counting. In this case, abandoning the manual way requires the use of -% auxiliary files in much the same way that \LaTeX\ uses for references and -% citations. +% anything else in a document can be difficult to achieve. The difficulty +% arises when the reference is \emph{before} the definition of all the elements +% that need to be counted. In this case, abandoning the manual way requires +% the use of auxiliary files in much the same way that \LaTeX\ uses for +% references and citations. % % Special packages like \xpackage{totpages} \cite{totpages} and % \xpackage{lastpage} \cite{lastpage} handle this issue for the total number of -% pages, but, to the best of my knowledge, there is no package that makes it easy -% to print the total number of arbitrary elements. +% pages, but, to the best of my knowledge, there is no package that makes it +% easy to print the total number of arbitrary elements. % % The \xpackage{TotCount} package hopefully fills this gap. It enables the -% computation and display of the number that was assigned last to a counter -% inside a document (usually the maximum value of the counter). The user just -% has to include the \xpackage{TotCount} package, and \emph{register} a counter -% as a ``total counter''. Then, getting the maximum value of that counter is as -% easy as calling the macro |\total|\marg{counter} at the desired place, and -% running \LaTeX\ twice. +% computation and display of the last number assigned to a counter inside a +% document (usually the maximum value of the counter). The user just has to +% include the \xpackage{TotCount} package, and \emph{register} a counter as a +% ``total counter''. Then, getting the maximum value of that counter is as easy +% as calling the macro |\total|\marg{counter} at the desired place, and running +% \LaTeX\ twice. % % As an early example, the commands % \begin{macrocode} @@ -161,10 +180,14 @@ % \DescribeMacro{\total} % To print the maximum value of \meta{counter} we can call the macro % |\total|\marg{counter}. The first time \LaTeX\ runs on the document this -% macro will display the symbols ``$??$'' and write the message -% ``|Rerun to get correct total counts|'' in the terminal. The second time +% macro will display the symbols ``$??$'' and output in the terminal the +% warning +% \begin{verbatim} +% Package totcount Warning: Rerun to get correct total counts on input line X +% \end{verbatim} +% where |X| is the line the |\total| macro was used. The second time % \LaTeX\ runs on the same document (and every time after that) the macro will -% display the correct total count of \meta{counter}. +% display the total count of \meta{counter} recorded in the auxiliary file. % % \DescribeMacro{\totvalue} % We can obtain the numeric total value of \meta{counter} (in contrast to @@ -208,7 +231,7 @@ % To compile the documentation run % \begin{verbatim} %pdflatex totcount.drv -%makeindex -s gind.ist totcount +%makeindex -s gind.ist totcount.idx %makeindex -s gglo.ist -o totcount.gls totcount.glo %pdflatex totcount.drv \end{verbatim} % @@ -380,11 +403,14 @@ %% argument. If the total value is yet to be computed (at the first time %% \LaTeX\ runs on the document) then its value is |-1| and the output of the %% command is $??$. +% \changes{v1.2}{2011/01/25}{Warnings are now reported using the +% PackageWarning command, which improves interoperability with editing +% environments such as LyX} % \begin{macrocode} \newcommand\total[1]{% \def\tmp@val{\value{#1@totc}}% \ifnum\tmp@val=-1% - \message{Rerun to get correct total counts}% + \PackageWarning{totcount}{Rerun to get correct total counts}% $??$% \else% \number\value{#1@totc}% @@ -412,7 +438,7 @@ \InputIfFileExists{#1}{% \message{TotCount inputs file '#1'}% }{% - \message{TotCount Warning: File '#1' does not exist!}% + \PackageWarning{totcount}{File '#1' does not exist!}% \message{\space\space\space\space\space\space\space\space\space% \space\space\space\space\space\space\space\space\space% Ignoring \string\usetotcountfile{#1}.}% @@ -508,7 +534,6 @@ and \total{page} \end{document} %</ex> % \end{macrocode} -% \Finale % % ^^A********************************************************************** % @@ -541,4 +566,6 @@ and \total{page} % \newblock \CTAN{macros/latex/contrib/totpages/} % \end{thebibliography} % +% \Finale +% \PrintIndex \PrintChanges \endinput diff --git a/Master/texmf-dist/source/latex/totcount/totcount.ins b/Master/texmf-dist/source/latex/totcount/totcount.ins index ad85db9fc31..9988af0b05f 100644 --- a/Master/texmf-dist/source/latex/totcount/totcount.ins +++ b/Master/texmf-dist/source/latex/totcount/totcount.ins @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{totcount.ins} - [2009/04/14 v1.0 Installation script for the TotCount package] + [2011/01/25 v1.2 Installation script for the TotCount package] \input docstrip.tex @@ -15,9 +15,9 @@ \preamble -The TotCount package, version 1.0, 2009/04/14 +The TotCount package, version 1.2, 2011/01/25 -Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@cs.tcd.ie) +Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@scss.tcd.ie) This program may be re-distributed and/or modified under the terms of the LaTeX Project Public License version 1.3c, or any later version. diff --git a/Master/texmf-dist/tex/latex/totcount/totcount.sty b/Master/texmf-dist/tex/latex/totcount/totcount.sty index a1fc0b5dfc3..76fb5559846 100644 --- a/Master/texmf-dist/tex/latex/totcount/totcount.sty +++ b/Master/texmf-dist/tex/latex/totcount/totcount.sty @@ -6,18 +6,18 @@ %% %% totcount.dtx (with options: `sty') %% -%% The TotCount package, version 1.0, 2009/04/14 +%% The TotCount package, version 1.2, 2011/01/25 %% -%% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@cs.tcd.ie) +%% Copyright (c) [2009] Vasileios Koutavas (Vasileios.Koutavas@scss.tcd.ie) %% %% This program may be re-distributed and/or modified under the terms of the %% LaTeX Project Public License version 1.3c, or any later version. %% The latest version of this license is in %% CTAN:macros/latex/base/lppl.txt %% -\def\totcfileversion{1.1} -\def\totcfiledate{2009/07/09} -\def\totcdocdate{9 Jul 2009} +\def\totcfileversion{1.2} +\def\totcfiledate{2011/01/25} +\def\totcdocdate{25 Jan 2011} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{totcount} [\totcfiledate \space v\totcfileversion \space package for getting% @@ -125,7 +125,7 @@ \newcommand\total[1]{% \def\tmp@val{\value{#1@totc}}% \ifnum\tmp@val=-1% - \message{Rerun to get correct total counts}% + \PackageWarning{totcount}{Rerun to get correct total counts}% $??$% \else% \number\value{#1@totc}% @@ -145,7 +145,7 @@ \InputIfFileExists{#1}{% \message{TotCount inputs file '#1'}% }{% - \message{TotCount Warning: File '#1' does not exist!}% + \PackageWarning{totcount}{File '#1' does not exist!}% \message{\space\space\space\space\space\space\space\space\space% \space\space\space\space\space\space\space\space\space% Ignoring \string\usetotcountfile{#1}.}% |