papermas

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

3 files changed, 59 insertions, 53 deletions

diff --git a/Master/texmf-dist/source/latex/papermas/papermas.drv b/Master/texmf-dist/source/latex/papermas/papermas.drv
index 238abff14f4..a90cc899a8f 100644
--- a/Master/texmf-dist/source/latex/papermas/papermas.drv
+++ b/Master/texmf-dist/source/latex/papermas/papermas.drv
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: papermas
-%% Version: 2011/06/02 v1.0f
+%% Version: 2011/08/08 v1.0g
 %% 
 %% Copyright (C) 2010, 2011 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -40,9 +40,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
 \ProvidesFile{papermas.drv}%
-  [2011/06/02 v1.0f Computes paper mass of a printout (HMM)]%
+  [2011/08/08 v1.0g Computes paper mass of a printout (HMM)]%
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
-\usepackage{holtxdoc}[2011/02/04]% v0.21
+\usepackage{holtxdoc}[2011/02/04]%  v0.21
 %% papermas may work with earlier versions of LaTeX2e and those
 %% class and package, but this was not tested.
 %% Please consider updating your LaTeX, class, and package
@@ -50,7 +50,7 @@
 %% recent version).
 \hypersetup{%
  pdfsubject={Computeing paper mass of a printout (HMM)},%
- pdfkeywords={LaTeX, papermas, papermass, paper mass, paper, mass, weight, totpages, pagesLTS, Hans-Martin Muench},%
+ pdfkeywords={LaTeX, papermas, papermass, paper mass, paper, mass, weight, totpages, pageslts, Hans-Martin Muench},%
  pdfencoding=auto,%
  pdflang={en},%
  breaklinks=true,%
diff --git a/Master/texmf-dist/source/latex/papermas/papermas.dtx b/Master/texmf-dist/source/latex/papermas/papermas.dtx
index 24a199a3413..77d228bca80 100644
--- a/Master/texmf-dist/source/latex/papermas/papermas.dtx
+++ b/Master/texmf-dist/source/latex/papermas/papermas.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: papermas.dtx
-% Version: 2011/06/02 v1.0f
+% Version: 2011/08/08 v1.0g
 %
 % Copyright (C) 2010, 2011 by
 %    H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -79,7 +79,7 @@
 \input docstrip.tex
 \Msg{****************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: papermas 2011/06/02 v1.0f Computes paper mass of a printout (HMM)}
+\Msg{* Package: papermas 2011/08/08 v1.0g Computes paper mass of a printout (HMM)}
 \Msg{****************************************************************************}
 
 \keepsilent
@@ -91,7 +91,7 @@
 This is a generated file.
 
 Project: papermas
-Version: 2011/06/02 v1.0f
+Version: 2011/08/08 v1.0g
 
 Copyright (C) 2010, 2011 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -175,9 +175,9 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
 \ProvidesFile{papermas.drv}%
-  [2011/06/02 v1.0f Computes paper mass of a printout (HMM)]%
+  [2011/08/08 v1.0g Computes paper mass of a printout (HMM)]%
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
-\usepackage{holtxdoc}[2011/02/04]% v0.21
+\usepackage{holtxdoc}[2011/02/04]%  v0.21
 %% papermas may work with earlier versions of LaTeX2e and those
 %% class and package, but this was not tested.
 %% Please consider updating your LaTeX, class, and package
@@ -185,7 +185,7 @@ and the derived files
 %% recent version).
 \hypersetup{%
  pdfsubject={Computeing paper mass of a printout (HMM)},%
- pdfkeywords={LaTeX, papermas, papermass, paper mass, paper, mass, weight, totpages, pagesLTS, Hans-Martin Muench},%
+ pdfkeywords={LaTeX, papermas, papermass, paper mass, paper, mass, weight, totpages, pageslts, Hans-Martin Muench},%
  pdfencoding=auto,%
  pdflang={en},%
  breaklinks=true,%
@@ -212,7 +212,7 @@ and the derived files
 %
 % \fi
 %
-% \CheckSum{374}
+% \CheckSum{377}
 %
 % \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
@@ -260,7 +260,7 @@ and the derived files
 % \DoNotIndex{\arabic,\newpage,\thepage,\value}
 %
 % \title{The \xpackage{papermas} package}
-% \date{2011/06/02 v1.0f}
+% \date{2011/08/08 v1.0g}
 % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
 %
 % \maketitle
@@ -270,7 +270,7 @@ and the derived files
 % to print a document as well as the mass of that printed version of the document,
 % useful e.\,g. when sending it by mail to determine the postage.\\
 % (The number of pages of a document can be determined with the
-% \xpackage{pagesLTS} package.)
+% \xpackage{pageslts} package.)
 % \end{abstract}
 %
 % \bigskip
@@ -294,7 +294,7 @@ and the derived files
 % \pagebreak
 %
 % \section{Introduction}
-% \indent This package is kind of an add-on to the \xpackage{pagesLTS} package,
+% \indent This package is kind of an add-on to the \xpackage{pageslts} package,
 % but because that already uses some resources and computing the
 % number of sheets of paper or the paper mass probably is not
 % needed so often, this was made into a separate package.\\
@@ -321,12 +321,12 @@ and the derived files
 %   |\usepackage[<|\textit{options}|>]{papermas}|
 % \end{quote}
 % \noindent in the preamble of your \LaTeXe\ source file
-% (preferably after calling the \xpackage{pagesLTS} package).\\
-% Because the \xpackage{pagesLTS} package is used to get the total
+% (preferably after calling the \xpackage{pageslts} package).\\
+% Because the \xpackage{pageslts} package is used to get the total
 % number of pages, please place a |\pagenumbering{...}| with
 % appropriate argument (e.\,g.~arabic, roman, Roman, fnsymbol,
 % alph, or Alph) right behind |\begin{document}| (see
-% documentation of \xpackage{pagesLTS} package).\\
+% documentation of \xpackage{pageslts} package).\\
 % Now you can say
 % \begin{verbatim}
 % This document consists of $\arabic{pagesLTS.pagenr}$~pages.
@@ -400,13 +400,13 @@ and the derived files
 % \section{Alternatives\label{sec:Alternatives}}
 %
 % For determining the number of pages (not sheets of paper)
-% instead of the \xpackage{pagesLTS} package the alternatives listed
+% instead of the \xpackage{pageslts} package the alternatives listed
 % in the description of that package could be used, but then
 % the according code in this package would need to be changed
 % (and also e.\,g. the |ifcounter| command used here).\\
 % With the \xpackage{totpages} package optionally the number of
 % sheets of paper needed to print the document can be computed, too.\\
-% (See \xpackage{pagesLTS} documentation.)\\
+% (See \xpackage{pageslts} documentation.)\\
 %
 % \bigskip
 %
@@ -444,8 +444,8 @@ and the derived files
  pdfpagelayout=SinglePage,%
  bookmarksopen=false%
 }
-\usepackage{alphalph}[2010/04/18]% v2.3
-\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2011/03/17]% v1.1o
+\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,%
+            romanMult=true,RomanMulti=true]{pageslts}[2011/08/08]% v1.2a
 %% These are the default options. %%
 \usepackage[format=4,masss=80,pagespersheet=2,decimalsep={.}]{papermas}
 %% These are the default options. %%
@@ -457,7 +457,7 @@ and the derived files
 \markboth{Example for papermas}{Example for papermas}
 
 This example demonstrates the use of package\newline
-\textsf{papermas}, v1.0f as of 2011/06/02 (HMM).\newline
+\textsf{papermas}, v1.0g as of 2011/08/08 (HMM).\newline
 The used options were \texttt{format=4} (ISO~A4),
 \texttt{masss=80} ($\unit{g}\unit{m}^{-2}$), and\newline
 \texttt{pagespersheet=2} (pages per sheet of paper,
@@ -556,7 +556,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
-\ProvidesPackage{papermas}[2011/06/02 v1.0f
+\ProvidesPackage{papermas}[2011/08/08 v1.0g
             Computes paper mass of a printout (HMM)]
 
 %    \end{macrocode}
@@ -582,12 +582,12 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 \RequirePackage{kvoptions}[2010/12/23]% v3.10
 %    \end{macrocode}
 %
-% For the total number of pages we need the \xpackage{pagesLTS}
+% For the total number of pages we need the \xpackage{pageslts}
 % package of myself (see subsection~\ref{ss:Downloads}):
 %
 %    \begin{macrocode}
-\RequirePackage{pagesLTS}[2011/03/17]% v1.1o
-\RequirePackage{intcalc}[2007/09/27]% v1.1; for intcalcPow
+\RequirePackage{pageslts}[2011/08/08]% v1.2a
+\RequirePackage{intcalc}[2007/09/27]%  v1.1; for intcalcPow
 %    \end{macrocode}
 %
 % A last information for the user:
@@ -721,7 +721,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 % We introduce a new counter |papermas@sheets| for the number of
 % sheets printed and initialize it with the number of pages
-% as computed by package \xpackage{pagesLTS},\newline
+% as computed by package \xpackage{pageslts},\newline
 % i.\,e. |pagesLTS.pagenr|.
 %
 %    \begin{macrocode}
@@ -820,14 +820,14 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 %    \begin{macrocode}
         \edef\papermastmpr{\arabic{papermas@tmpo}\papermas@decimalsep\arabic{papermas@tmpp}}%
-        \global\edef\papermas@mbs{\arabic{papermas@tmpo}}%
+        \xdef\papermas@mbs{\arabic{papermas@tmpo}}%
         \edef\papermastmpformat{\papermas@format}%
         \edef\papermastmpmasss{\papermas@masss}%
         \edef\papermastmppagespersheet{\papermas@pagespersheet}%
         \edef\papermastmpt{\arabic{papermas@sheets}}%
 %    \end{macrocode}
 %
-% We use the \xpackage{pagesLTS} package, which already was used
+% We use the \xpackage{pageslts} package, which already was used
 % to determine the total number of pages, to check for the
 % counter |papermassttl|. If it exists, nothing is done,
 % if it does not exist, it is declared as |\newcounter|
@@ -874,7 +874,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 % If we are allowed to write into the \xfile{aux}-file,
 % we do it here. If we are not allowed to do it,
-% the \xpackage{pagesLTS} package already gave an according
+% the \xpackage{pageslts} package already gave an according
 % error message.
 %
 %    \begin{macrocode}
@@ -884,7 +884,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % When it is read from the \xfile{aux}-file and
 % when its content is processed, the counter |papermassttl|
 % might not have been defined yet. Therefore we again use the
-% |\pagesLTS@ifcounter| command of the \xpackage{pagesLTS} package.
+% |\pagesLTS@ifcounter| command of the \xpackage{pageslts} package.
 %
 %    \begin{macrocode}
           \immediate\write\@auxout{\string
@@ -999,10 +999,10 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 % |\AfterLastShipout| is a command from the \xpackage{atveryend}
 % package of \textsc{Heiko Oberdiek}, which is already loaded by the
-% \xpackage{pagesLTS} package (about how to get the \xpackage{atveryend}
-% package, please see the documentation of the \xpackage{pagesLTS}
+% \xpackage{pageslts} package (about how to get the \xpackage{atveryend}
+% package, please see the documentation of the \xpackage{pageslts}
 % package -- you may need to get further packages for
-% \xpackage{pagesLTS} anyway, if they have not been installed
+% \xpackage{pageslts} anyway, if they have not been installed
 % within your \LaTeX\ system).
 %
 % \end{macro}
@@ -1011,7 +1011,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 % For pretty printing the message of \xpackage{papermas} three internal
 % commands are needed. We borrow the |pagesLTS.pnc.0| counter from the
-% \xpackage{pagesLTS} package instead of defining another new one.
+% \xpackage{pageslts} package instead of defining another new one.
 %
 %    \begin{macrocode}
 \newcommand{\papermas@log}[1]{%
@@ -1063,18 +1063,18 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %    \begin{macrocode}
   \ifx\papermas@rerun\pagesLTS@zero%
     \message{^^J}%
-    \message{papermas: ******************** Paper mass *******************^^J}%
+    \message{papermas: ******************** Paper mass ********************^^J}%
     \message{papermas: * This document consists of \arabic{pagesLTS.pagenr} pages.}
-    \papermas@spaces{\arabic{pagesLTS.pagenr}}{15}%
+    \papermas@spaces{\arabic{pagesLTS.pagenr}}{16}%
     \message{papermas: * When printing \papermaspagespersheet\space pages on one sheet of paper,}
-    \papermas@spaces{\papermaspagespersheet}{5}%
+    \papermas@spaces{\papermaspagespersheet}{6}%
     \message{papermas: * \papermassheets\space sheets will be needed.}
-    \papermas@spaces{\papermassheets}{25}%
+    \papermas@spaces{\papermassheets}{26}%
     \message{papermas: * For ISO A \papermasformat\space paper of \papermasmasss\space g/m^2 specific mass,}
-    \papermas@spaces{\papermasmasss}{6}%
+    \papermas@spaces{\papermasmasss}{7}%
     \message{papermas: * the printout will have a mass of about \papermasstotal\space g.}
-    \papermas@spaces{\papermas@mbs}{4}%
-    \message{papermas: ***************************************************^^J}
+    \papermas@spaces{\papermas@mbs}{5}%
+    \message{papermas: ****************************************************^^J}
     \message{^^J}
   \fi%
   }
@@ -1090,11 +1090,11 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 %    \begin{macrocode}
 \newcommand\papermas@powerof[2]{%
-  \PackageError{papermas}{Obsolete command \string\papermas@powerof used}{%
-    The command \string\papermas@powerof has been removed from the papermas package.\MessageBreak%
-    Please use e.g. \string\intcalcPow from the intcalc package instead.\MessageBreak%
+  \PackageError{papermas}{Obsolete command \string\papermas@powerof\space used}{%
+    The command \string\papermas@powerof\space has been removed from the papermas package.\MessageBreak%
+    Please use e.g. \string\intcalcPow\space from the intcalc package instead.\MessageBreak%
     You can now just type Return to continue, but this error message will be\MessageBreak%
-    issued again when using \string\papermas@powerof, and the command might be\MessageBreak%
+    issued again when using \string\papermas@powerof,\space and the command might be\MessageBreak%
     removed completely from future versions of the papermas package.\MessageBreak%
    }%
   \AtVeryVeryEnd{%
@@ -1149,8 +1149,8 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % \item[-] package \xpackage{kvoptions}, 2010/12/23, v3.10,\\
 %           \CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx}
 %
-% \item[-] package \xpackage{pagesLTS}, 2011/03/17, v1.1o,\\
-%           \CTAN{macros/latex/contrib/pageslts/pagesLTS.dtx}\\
+% \item[-] package \xpackage{pageslts}, 2011/08/08, v1.2a,\\
+%           \CTAN{macros/latex/contrib/pageslts/pageslts.dtx}\\
 % \end{description}
 %
 % \DescribeMacro{papermas-example.tex}
@@ -1160,7 +1160,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % \item[-] class \xpackage{article}, 2007/10/19, v1.4h, from \xpackage{classes.dtx}:\\
 %           \CTAN{macros/latex/base/classes.dtx}
 %
-% \item[-] package \xpackage{papermas}, 2011/06/02, v1.0f,\\
+% \item[-] package \xpackage{papermas}, 2011/08/08, v1.0g,\\
 %           \CTAN{macros/latex/contrib/papermas/papermas.dtx}\\
 %   (Well, it is the example file for this package, and because you are reading the
 %    documentation for the \xpackage{papermas} package, it can be assumed that you already
@@ -1415,7 +1415,8 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %     \item There is a new version of the used \xpackage{kvoptions} package: 2010/12/23,~v3.10.
 %     \item There is a new version of the used \xpackage{pagesLTS} package: 2011/03/17,~v1.1o.
 %     \item The \xpackage{holtxdoc} package was fixed (recent version: 2011/02/04,~v0.21),
-%             therefore the warning in \xfile{drv} could be removed.
+%             therefore the warning in \xfile{drv} could be removed.~-- Adapted the style of
+%             this documentation to new \textsc{Oberdiek} \xfile{dtx} style.
 %     \item There is a new version of the used \xpackage{hyperref} package: 2011/04/17,~v6.82g.
 %     \item The rerun warnings are given after the \texttt{filelist} (if that is called
 %             with |\listfiles|) and the final \xpackage{papermas} information is presented
@@ -1426,6 +1427,11 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %     \item Removed five counters.
 %     \item A lot of small changes (also in the README).
 %   \end{Version}
+%   \begin{Version}{2011/08/08 v1.0g}
+%     \item The \xpackage{pagesLTS} package has been renamed to \xpackage{pageslts}: 2011/08/08,~v1.2a.
+%     \item Replaced |\global\edef| by |\xdef|.
+%     \item Minor details.
+%   \end{Version}
 % \end{History}
 %
 % \bigskip
diff --git a/Master/texmf-dist/source/latex/papermas/papermas.ins b/Master/texmf-dist/source/latex/papermas/papermas.ins
index 45242009c74..d28622fc278 100644
--- a/Master/texmf-dist/source/latex/papermas/papermas.ins
+++ b/Master/texmf-dist/source/latex/papermas/papermas.ins
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: papermas
-%% Version: 2011/06/02 v1.0f
+%% Version: 2011/08/08 v1.0g
 %% 
 %% Copyright (C) 2010, 2011 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -41,7 +41,7 @@
 \input docstrip.tex
 \Msg{****************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: papermas 2011/06/02 v1.0f Computes paper mass of a printout (HMM)}
+\Msg{* Package: papermas 2011/08/08 v1.0g Computes paper mass of a printout (HMM)}
 \Msg{****************************************************************************}
 
 \keepsilent
@@ -53,7 +53,7 @@
 This is a generated file.
 
 Project: papermas
-Version: 2011/06/02 v1.0f
+Version: 2011/08/08 v1.0g
 
 Copyright (C) 2010, 2011 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>