From eeae784fdecdd4ccedb0777815d18be0bae05eab Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 Jul 2010 16:39:46 +0000 Subject: papermas update (1jul10) git-svn-id: svn://tug.org/texlive/trunk@19351 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/papermas/README | 19 ++- .../doc/latex/papermas/papermas-example.pdf | Bin 103773 -> 103773 bytes .../doc/latex/papermas/papermas-example.tex | 8 +- Master/texmf-dist/doc/latex/papermas/papermas.pdf | Bin 449754 -> 457584 bytes .../texmf-dist/source/latex/papermas/papermas.drv | 4 +- .../texmf-dist/source/latex/papermas/papermas.dtx | 178 ++++++++++++++------- .../texmf-dist/source/latex/papermas/papermas.ins | 2 +- Master/texmf-dist/tex/latex/papermas/papermas.sty | 15 +- Master/tlpkg/bin/tlpkginfo | 2 +- 9 files changed, 146 insertions(+), 82 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/papermas/README b/Master/texmf-dist/doc/latex/papermas/README index ec3b8e97bbc..a9ea22d2502 100644 --- a/Master/texmf-dist/doc/latex/papermas/README +++ b/Master/texmf-dist/doc/latex/papermas/README @@ -1,4 +1,4 @@ -README for papermas package, 2010/06/03, v1.0b +README for papermas package, 2010/06/24, v1.0c TABLE OF CONTENTS @@ -19,7 +19,7 @@ TABLE OF CONTENTS ============== This package allows to compute the mass of a printed version of a -document, usefull e. g. when sending it by mail to determine the postage. +document, useful e. g. when sending it by mail to determine the postage. Warning/Disclaimer: The mass of (printer's) ink has to be added (and that of envelope, address sticker, stamps,...). So, this is only an estimation without @@ -31,22 +31,22 @@ Further it allows to compute "base to the power of exponent" inside LaTeX. 2 DOWNLOAD ========== -`papermas' should become available on CTAN soon: - CTAN:macros/latex/contrib/muench/papermas/ +`papermas' is available on CTAN: + CTAN:macros/latex/contrib/papermas/ Also a ZIP file is provided that contains the files, already sorted in a TDS tree (should become available on CTAN soon): - CTAN:install/macros/latex/contrib/muench/papermas.tds.zip + CTAN:install/macros/latex/contrib/papermas.tds.zip `CTAN:' means one of the `Comprehensive TeX Archive Network' -nodes or one of its mirrors. This is explained in +nodes or one of its mirrors. This is explained in http://www.tex.ac.uk/cgi-bin/texfaq2html?label=archives The CTAN stuff will be mirrored automatically from the ftp server, so - ftp://ftp.tug.org/pub/tex/muench/pagesLTS/ + ftp://ftp.tug.org/pub/tex/pagesLTS/ corresponds to - CTAN:macros/latex/contrib/muench/pagesLTS/ + CTAN:macros/latex/contrib/pagesLTS/ 3 INSTALLATION @@ -95,8 +95,7 @@ other packages: * kvoptions.sty: CTAN:macros/latex/contrib/oberdiek/kvoptions.pdf * pagesLTS.sty: - CTAN:macros/latex/contrib/muench/pagesLTS.dtx - (submitted, should become available on CTAN soon) + CTAN:macros/latex/contrib/pagesLTS.dtx which again load other packages (see the result of the \listfiles comman in the log-file of the example). diff --git a/Master/texmf-dist/doc/latex/papermas/papermas-example.pdf b/Master/texmf-dist/doc/latex/papermas/papermas-example.pdf index ef7e1901dfe..7f5cb48399a 100644 Binary files a/Master/texmf-dist/doc/latex/papermas/papermas-example.pdf and b/Master/texmf-dist/doc/latex/papermas/papermas-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/papermas/papermas-example.tex b/Master/texmf-dist/doc/latex/papermas/papermas-example.tex index 89a6a2a192b..db0cb31d08d 100644 --- a/Master/texmf-dist/doc/latex/papermas/papermas-example.tex +++ b/Master/texmf-dist/doc/latex/papermas/papermas-example.tex @@ -38,7 +38,7 @@ %% \documentclass[british,a4paper]{article} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\usepackage{hyperref}[2010/05/13]% v6.81e +\usepackage{hyperref}[2010/06/04]% v6.81f \hypersetup{% extension=pdf,% plainpages=false,% @@ -55,9 +55,9 @@ bookmarksopen=false% } \usepackage{alphalph}[2010/04/18]% v2.3 -\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/06/03]% v1.1b +\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/06/24]% v1.1c %% These are the default options. %% -\usepackage[format=4,masss=80,pagespersheet=2]{papermas} +\usepackage[format=4,masss=80,pagespersheet=2,decimalsep={.}]{papermas} %% These are the default options. %% \listfiles \begin{document} @@ -67,7 +67,7 @@ \markboth{Example for papermas}{Example for papermas} This example demonstrates the use of package\newline -\textsf{papermas}, v1.0b as of 2010/06/03 (HMM).\newline +\textsf{papermas}, v1.0c as of 2010/06/24 (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, diff --git a/Master/texmf-dist/doc/latex/papermas/papermas.pdf b/Master/texmf-dist/doc/latex/papermas/papermas.pdf index d8c55f1b6b3..fe05832e13d 100644 Binary files a/Master/texmf-dist/doc/latex/papermas/papermas.pdf and b/Master/texmf-dist/doc/latex/papermas/papermas.pdf differ diff --git a/Master/texmf-dist/source/latex/papermas/papermas.drv b/Master/texmf-dist/source/latex/papermas/papermas.drv index b8cb4bc16f7..0b27a4aef7e 100644 --- a/Master/texmf-dist/source/latex/papermas/papermas.drv +++ b/Master/texmf-dist/source/latex/papermas/papermas.drv @@ -37,7 +37,7 @@ %% papermas-example.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesFile{papermas.drv}[2010/06/03 v1.0b% +\ProvidesFile{papermas.drv}[2010/06/24 v1.0c% Computes paper mass of a printout (HMM)]% \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2010/04/24]% v0.19 @@ -48,7 +48,7 @@ %% recent version). %% Warning: holtxdoc, 2010/04/24 v0.19, requires the packages %% hypdoc, 2010/03/26, v1.9 -%% hyperref, 2010/03/30, v6.80u (latest: 2010/05/13, v6.81e) +%% hyperref, 2010/03/30, v6.80u (latest: 2010/06/04 v6.81f) %% pdftexcmds, 2010/04/01, v0.9 %% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) %% hologo, 2010/04/24, v1.2 diff --git a/Master/texmf-dist/source/latex/papermas/papermas.dtx b/Master/texmf-dist/source/latex/papermas/papermas.dtx index c70272b3a51..d1532e4d4ef 100644 --- a/Master/texmf-dist/source/latex/papermas/papermas.dtx +++ b/Master/texmf-dist/source/latex/papermas/papermas.dtx @@ -1,9 +1,9 @@ % \iffalse meta-comment % % papermas package -% file version: v1.0b -% file date: 2010/06/03 -% documentation date: 2010/06/03 +% file version: v1.0c +% file date: 2010/06/24 +% documentation date: 2010/06/24 % % Copyright (C) 2010 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de) % Portions of code copyrighted by other people as marked. @@ -85,7 +85,7 @@ \obeyspaces \Msg{******************************************************} \Msg{* Installation *} -\Msg{* Package: papermas v1.0b 2010/06/03 LaTeX2e package *} +\Msg{* Package: papermas v1.0c 2010/06/24 LaTeX2e package *} \Msg{* Computes paper mass of a printout (HMM) *} \Msg{******************************************************} @@ -180,7 +180,7 @@ and the derived files % \begin{macrocode} %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesFile{papermas.drv}[2010/06/03 v1.0b% +\ProvidesFile{papermas.drv}[2010/06/24 v1.0c% Computes paper mass of a printout (HMM)]% \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2010/04/24]% v0.19 @@ -191,7 +191,7 @@ and the derived files %% recent version). %% Warning: holtxdoc, 2010/04/24 v0.19, requires the packages %% hypdoc, 2010/03/26, v1.9 -%% hyperref, 2010/03/30, v6.80u (latest: 2010/05/13, v6.81e) +%% hyperref, 2010/03/30, v6.80u (latest: 2010/06/04 v6.81f) %% pdftexcmds, 2010/04/01, v0.9 %% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) %% hologo, 2010/04/24, v1.2 @@ -372,20 +372,21 @@ and the derived files % \DoNotIndex{\plainTeX,\TeX,\LaTeX,\pdfLaTeX} % \DoNotIndex{\holtxdoc,\kvoptions,\Oberdiek} % \DoNotIndex{\gdef,\listfiles,\thepage,\totpages,\undefined,\value} +% \DoNotIndex{\markboth,\M"{u}ench,\section,\totpages} % % \title{The \textsf{papermas} package\footnote{This file% -% has version number v1.0b, last% -% revised 2010/06/03, documentation dated 2010/06/03.}} +% has version number v1.0c, last% +% revised 2010/06/24, documentation dated 2010/06/24.}} % \author{H.-Martin M\"{u}nch\\ % (\texttt{Martin dot Muench at Uni-Bonn dot de})} -% \date{2010/06/03} +% \date{2010/06/24} % % \maketitle % % \begin{abstract} % This package allows to compute the number of sheets of paper needed to print a document % as well as the mass of that printed version of the document, -% usefull e.\,g. when sending it by mail to determine the postage.\\ +% useful e.\,g. when sending it by mail to determine the postage.\\ % (The number of pages of a document can be determined with the % \textsf{pagesLTS} package.)~--\\ % Further this package allows to compute @@ -421,9 +422,9 @@ and the derived files % number of sheets of paper or the paper mass probably is not % needed so often, this was made into a separate package.\\ % \indent It allows to compute the number of sheets of paper needed to print a document -% (usefull when the paper is running out) +% (useful when the paper is running out) % as well as the mass of that printed version of the document, -% usefull e.\,g. when sending it by mail to determine the postage.\\ +% useful e.\,g. when sending it by mail to determine the postage.\\ % \indent \textbf{Warning/Disclaimer}: The mass of (printer's) ink has to be added % (and that of envelope, address sticker, stamps,...). % So, this is only an estimation without guarantee -- @@ -433,11 +434,11 @@ and the derived files % \ inside \LaTeX.\\ % \indent The name \textsf{papermas} is short for paper mass but written with only one \textsf{s}, % because some software has problems with names with more than eight letters.\\ -% It is \textsf{mass} and gives a reault in grammes $\left[ \unit{g}\right]$, +% It is \textsf{mass} and gives a result in grammes $\left[ \unit{g}\right]$, % because the weight $F=m\cdot g$ (really $\overrightarrow{F}=m\cdot \overrightarrow{g}$) % $\left[ \unit{N}\right]$ would need the knowledge about the gravitational acceleration % $g$ (depending on place and time, in central Europe approximately $9.81\unit{m}/\unit{s}^{2}$) -% and give a result in \textsc{Newton}, which probably is not very usefull. +% and give a result in \textsc{Newton}, which probably is not very useful. % % \pagebreak % @@ -472,6 +473,17 @@ and the derived files % specific mass, the printout will have a mass of about % $130\unit{g}$. % \end{quote} +% This information is also presented at the screen while compiling +% your document (look for \textsf{papermas}), in the \xfile{log} +% file (search for \textsf{Package papermas Info}), and can be found +% in the \xfile{aux} file~-- probably one does not want to have the +% information in the printed document.\\ +% (One could use the \textsf{color} package and +% \begin{verbatim} +% {\color{white} This document ... of about $\papermasstotal \unit{g}$.} +% \end{verbatim} +% which does not show in the printed document (white background of the page +% assumed), but can be made visible on the screen be marking that text.) % % \subsection{Options} % \DescribeMacro{options} @@ -499,6 +511,19 @@ and the derived files % differs from the one chosen for printing, the result will be wrong, % of course. % +% \subsubsection{decimalsep\label{sss:decimalsep}} +% \DescribeMacro{decimalsep} +% \indent Option |decimalsep| wants to know, what should be used +% for the decimal separator. In English this is +% \textquotedblleft .\textquotedblright , while in German it is +% \textquotedblleft ,\textquotedblright . Enclose this in brackets, +% e.\,g.~|decimalsep={.}| or |decimalsep={,}|. The default is +% \textquotedblleft .\textquotedblright . This is used for the +% mass of the printed document, and this value is given at +% the screen during compilation as well as in the \xfile{log} +% and \xfile{aux} files. Therefore something like +% |decimalsep={,\,}| would cause trouble there. +% % \section{Alternatives\label{sec:Alternatives}} % % For determining the number of pages (not sheets of paper) @@ -530,7 +555,7 @@ and the derived files %<*example> \documentclass[british,a4paper]{article} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\usepackage{hyperref}[2010/05/13]% v6.81e +\usepackage{hyperref}[2010/06/04]% v6.81f \hypersetup{% extension=pdf,% plainpages=false,% @@ -547,9 +572,9 @@ and the derived files bookmarksopen=false% } \usepackage{alphalph}[2010/04/18]% v2.3 -\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/06/03]% v1.1b +\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/06/24]% v1.1c %% These are the default options. %% -\usepackage[format=4,masss=80,pagespersheet=2]{papermas} +\usepackage[format=4,masss=80,pagespersheet=2,decimalsep={.}]{papermas} %% These are the default options. %% \listfiles \begin{document} @@ -559,7 +584,7 @@ and the derived files \markboth{Example for papermas}{Example for papermas} This example demonstrates the use of package\newline -\textsf{papermas}, v1.0b as of 2010/06/03 (HMM).\newline +\textsf{papermas}, v1.0c as of 2010/06/24 (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, @@ -661,7 +686,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesPackage{papermas}[2010/06/03 v1.0b +\ProvidesPackage{papermas}[2010/06/24 v1.0c Computes paper mass of a printout (HMM)]% % \end{macrocode} @@ -672,7 +697,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline %% Allows to compute the number of sheets of paper %% needed to print a document as well as the %% mass of that printed version of the document, -%% usefull e. g. when sending it by mail to determine the postage. +%% useful e. g. when sending it by mail to determine the postage. %% Warning/Disclaimer: Mass of (printer's) ink has to be added %% (and that of envelope, address sticker, stamps,...)! %% So, this is only an estimation without guarantee - @@ -693,7 +718,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % package of myself (see subsection~\ref{ss:Downloads}): % % \begin{macrocode} -\RequirePackage{pagesLTS}[2010/06/03]% v1.1b +\RequirePackage{pagesLTS}[2010/06/24]% v1.1c % \end{macrocode} % % A last information for the user(s): @@ -717,6 +742,9 @@ I do NOT think, that it is necessary to print THIS file, really\newline % default: 80 (g/(m^2)) \DeclareStringOption[2]{pagespersheet}[2]% number of pages per sheet, % for duplex printing this is 2. +\DeclareStringOption[.]{decimalsep}[.]% decimal separator, + % e. g. "." or ",": decimalsep={,} - brackets are needed!!! + % decimalsep={,\,} does not work for screen, aux, log output! \ProcessKeyvalOptions* @@ -868,7 +896,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline \PackageError{papermas}{% The number of pages per sheet must be positive.}{% You cannot print less than one TeX page per sheet of paper.\MessageBreak% - The value found was \papermas@pagespersheet .\ \MessageBreak% + The value found was \papermas@pagespersheet .\MessageBreak% } \else % \end{macrocode} @@ -916,14 +944,14 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \begin{macrocode} \multiply \value{papermasmasss} \value{papermas@sheets} - % default: 8000 + % default: 8000 (no default for this) % \end{macrocode} % % The result is in $\unit{g}\unit{m}^{-2}$.\\ % A sheet with format ISO A0 has a size of $1\unit{m}^{2}$,\\ % a sheet with format ISO A1 has a size of $1\unit{m}^{2}\cdot 2^{-1}$,\\ % a sheet with format ISO A2 has a size of $1\unit{m}^{2}\cdot 2^{-2}$,\\ -% \ldots +% \ldots, and\\ % a sheet with format ISO A\textit{n} has a size of $1\unit{m}^{2}\cdot 2^{-n}$.\\ % Therefore we compute $2^{\text{\textbackslash value\{papermasA\}}}$: % @@ -976,11 +1004,12 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \end{macrocode} % % The result in the example above is $297/100=2.\,97\approx 3.\,0$. -% We write this into |\papermastmpr| and the options' values into +% We write this into |\papermastmpr| (where |\papermas@decimalsep|) is +% the decimal separator) and the (other) options' values into % temporary definitions, as well as the number of sheets: % % \begin{macrocode} - \edef\papermastmpr{\arabic{papermas@tmpo}.\arabic{papermas@tmpp}}% + \edef\papermastmpr{\arabic{papermas@tmpo}\papermas@decimalsep\arabic{papermas@tmpp}}% \edef\papermastmpformat{\papermas@format}% \edef\papermastmpmasss{\papermas@masss}% \edef\papermastmppagespersheet{\papermas@pagespersheet}% @@ -1096,6 +1125,8 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \item which will also appear in the \xfile{log}-file. %\end{enumerate} % +% \pagebreak +% % We want to give also |\papermastmpt = \arabic{papermas@sheets}| to the user, % i.\,e.~the number of sheets needed to print the document. % Therefore we follow the same procedure: @@ -1173,7 +1204,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % (\textsf{atveryend} package of Heiko Oberdiek, v1.5 as of 2010/03/24)\\ % % \DescribeMacro{Error code} -% Here it is used give a rerun warning, when it is needed: +% Here it is used to give a rerun warning, when it is needed: % % \begin{macrocode} \ifnum\value{papermas@rerun}>0 @@ -1184,6 +1215,8 @@ I do NOT think, that it is necessary to print THIS file, really\newline }% % \end{macrocode} % +% \pagebreak +% % The \textquotedblleft Error code\textquotedblright\ can be deciphered as follows:\\ % % |\papermasstotal 000001|\\ @@ -1195,7 +1228,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % e.\,g. error code |1001| is |001001| is |\papermasmasss| and |\papermasstotal|.\\ % -% If no nesessarity for a rerun was detected~(! Check for other rerun warnings!), +% If no necessarity for a rerun was \textit{detected} (Check for other rerun warnings!), % the final |\PackageInfo| is given: % % \begin{macrocode} @@ -1231,7 +1264,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \subsection{Downloads\label{ss:Downloads}} % -% Everything \textit{should} be available on \CTAN{}, \url{ftp://ftp.ctan.org/tex-archive/}, +% Everything should be available on \CTAN{}, \url{ftp://ftp.ctan.org/tex-archive/}, % but may need additional packages themselves.\\ % % \DescribeMacro{papermas.dtx} @@ -1258,18 +1291,16 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \item[-] package \textsf{kvoptions}, 2010/02/22, v3.7,\\ % \CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx} % -% \item[-] package \textsf{pagesLTS}, 2010/06/03, v1.1b,\\ -% \CTAN{macros/latex/contrib/muench/pagesLTS/pagesLTS.dtx}\\ -% (submitted, should become available at that location soon) +% \item[-] package \textsf{pagesLTS}, 2010/06/24, v1.1c,\\ +% \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx}\\ % \end{description} % % \DescribeMacro{papermas-example.tex} % The |papermas-example.tex| requires the same files as all % documents using the \textsf{papermas} package, especially: % \begin{description} -% \item[-] package \textsf{papermas}, 2010/06/03, v1.0b,\\ -% \CTAN{macros/latex/contrib/muench/papermas/papermas.dtx}\\ -% (submitted, should become available at that location soon)\\ +% \item[-] package \textsf{papermas}, 2010/06/24, v1.0c,\\ +% \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 \textsf{papermas} package, it can be assumed that you already % have some version of it -- is it the current one?) @@ -1293,7 +1324,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \textbf{Warning}: holtxdoc, 2010/04/24 v0.19, requires the packages % \begin{description} % \item[-] hypdoc, 2010/03/26, v1.9 -% \item[-] hyperref, 2010/03/30, v6.80u (latest: 2010/05/13, v6.81e) +% \item[-] hyperref, 2010/03/30, v6.80u (latest: 2010/06/04, v6.81f) % \item[-] pdftexcmds, 2010/04/01, v0.9 % \item[-] ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) % \item[-] hologo, 2010/04/24, v1.2 @@ -1306,28 +1337,50 @@ I do NOT think, that it is necessary to print THIS file, really\newline % and use this, because the packages in there should be both % recent and compatible.)\\ % +% \pagebreak +% +% \DescribeMacro{M\"{u}nch} +% Packages of mine:\\ +% \begin{description} +% \item[undolabl] 2010/06/24, v1.0c, \CTAN{macros/latex/contrib/undolabl.dtx}\\ +% That package allows to override existing labels, especially automatically generated ones. +% +% \item[pagesLTS] 2010/06/24, v1.1c, \CTAN{macros/latex/contrib/pagesLTS.dtx}\\ +% That package allows to refer to the (very) last page, gives the total number of +% pages, references to special pages, facilitates the use of nearly any pagenumbering +% you like (e.\,g. negative |Roman| numbers or more than |Z| pages with |Alph| page numbering), +% and works even with |fnsymbol| page numbers. +% +% \item[papermas] 2010/06/24, v1.0c, \CTAN{macros/latex/contrib/papermas.dtx}\\ +% The package described in this very documentation. +% +% \item[hrefhide] 2010/06/24, v1.0c, \CTAN{macros/latex/contrib/hrefhide.dtx}\\ +% That package allows to \textquotedblleft hide\textquotedblright\ some (hyperlinked) +% text when printing the document while keeping the layout. +% \end{description} +% % \subsection{Package, unpacking TDS} % -% \paragraph{Package.} This package should become available soon on \CTAN{} +% \paragraph{Package.} This package is available on \CTAN{}: % \begin{description} -% \item[\CTAN{macros/latex/contrib/muench/papermas/papermas.dtx}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/papermas.dtx}]\hspace*{0.1cm} \\ % The source file. -% \item[\CTAN{macros/latex/contrib/muench/papermas/papermas.ins}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/papermas.ins}]\hspace*{0.1cm} \\ % The installation file. -% \item[\CTAN{macros/latex/contrib/muench/papermas/papermas.drv}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/papermas.drv}]\hspace*{0.1cm} \\ % The driver to generate the documentation. -% \item[\CTAN{macros/latex/contrib/muench/papermas/ltxdoc.cfg}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/ltxdoc.cfg}]\hspace*{0.1cm} \\ % The \LaTeX documentation configuration file, also for generating the documentation. -% \item[\CTAN{macros/latex/contrib/muench/papermas/papermas.pdf}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/papermas.pdf}]\hspace*{0.1cm} \\ % The documentation. -% \item[\CTAN{macros/latex/contrib/muench/papermas/papermas.sty}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/papermas.sty}]\hspace*{0.1cm} \\ % The \xext{sty}le file. -% \item[\CTAN{macros/latex/contrib/muench/papermas/papermas-example.tex}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/papermas-example.tex}]\hspace*{0.1cm} \\ % The example file. -% \item[\CTAN{macros/latex/contrib/muench/papermas/papermas-example.pdf}]\hspace*{0.1cm} \\ +% \item[\CTAN{macros/latex/contrib/papermas/papermas-example.pdf}]\hspace*{0.1cm} \\ % The compiled example file, as it should look like. -% \item[\CTAN{install/macros/latex/contrib/muench/papermas/papermas.tds.zip}]\hspace*{0.1cm} \\ -% Everything in TDS compliant, compiled format. +% \item[\CTAN{install/macros/latex/contrib/papermas/papermas.tds.zip}]\hspace*{0.1cm} \\ +% Everything in TDS compliant, compiled format (submitted, should become available soon). % \end{description} % % For required other packages, see the preceding subsection. @@ -1473,15 +1526,15 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \section{Things suggested to be done\label{sec:todo}} % % \begin{itemize} -% \item Include a correct checksum for \textsf{papermas}. -% \item Insert the final references where to get the files at \CTAN{}. +% \item Include a correct checksum for \textsf{papermas}. +% \item Insert the final reference where to get the \xfile{tds.zip} file at \CTAN{}. % \end{itemize} % % \section{Acknowledgements} % % I (H.-Martin M\"{u}nch) would like to thank Heiko Oberdiek % (heiko dot oberdiek at googlemail dot com) for providing -% a~lot~(!) of usefull packages (from which I also got everything I +% a~lot~(!) of useful packages (from which I also got everything I % know about creating a file in \xfile{dtx} format, ok, say it: copying), % and the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex} % newsgroups for their help in all things \TeX. @@ -1489,14 +1542,23 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \phantomsection % \begin{History}\label{History} % \begin{Version}{2010/06/01 v1.0} -% \item First version of this package. +% \item First version of this package. % \end{Version} % \begin{Version}{2010/06/03 v1.0b} -% \item New |\papermassheets| and reruncheck introduced; several small changes. -% \item Example adapted to other examples of mine. -% \item Updated references to other packages. -% \item TDS locations updated. -% \item Several changes in the documentation and the Readme file. +% \item New |\papermassheets| and reruncheck introduced; several small changes. +% \item Example adapted to other examples of mine. +% \item Updated references to other packages. +% \item TDS locations updated. +% \item Several changes in the documentation and the Readme file. +% \end{Version} +% \begin{Version}{2010/06/24 v1.0c} +% \item \textsf{holtxdoc} warning in \xfile{drv} updated. +% \item Corrected the location of the package at CTAN.\\ +% (TDS still missing due to packaging error.) +% \item Updated references to other packages: \textsf{hyperref} and \textsf{pagesLTS}. +% \item Added a list of my other packages. +% \item Several changes to the documentation. +% \item Introduced new \textbf{option}: |decimalsep|. % \end{Version} % \end{History} % @@ -1505,9 +1567,9 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \bigskip % % When you find a mistake or have a suggestion for an improvement of this package, -% please send an e-mail to the maintainer, thanks!\\ +% please send an e-mail to the maintainer, thanks! (Please see BUG REPORTS in the README.) % -% \newpage +% \pagebreak % % \PrintIndex % diff --git a/Master/texmf-dist/source/latex/papermas/papermas.ins b/Master/texmf-dist/source/latex/papermas/papermas.ins index c7ce3938d22..f97634f96e3 100644 --- a/Master/texmf-dist/source/latex/papermas/papermas.ins +++ b/Master/texmf-dist/source/latex/papermas/papermas.ins @@ -41,7 +41,7 @@ \obeyspaces \Msg{******************************************************} \Msg{* Installation *} -\Msg{* Package: papermas v1.0b 2010/06/03 LaTeX2e package *} +\Msg{* Package: papermas v1.0c 2010/06/24 LaTeX2e package *} \Msg{* Computes paper mass of a printout (HMM) *} \Msg{******************************************************} diff --git a/Master/texmf-dist/tex/latex/papermas/papermas.sty b/Master/texmf-dist/tex/latex/papermas/papermas.sty index 391052311fc..2d7b0f514a9 100644 --- a/Master/texmf-dist/tex/latex/papermas/papermas.sty +++ b/Master/texmf-dist/tex/latex/papermas/papermas.sty @@ -37,13 +37,13 @@ %% papermas-example.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesPackage{papermas}[2010/06/03 v1.0b +\ProvidesPackage{papermas}[2010/06/24 v1.0c Computes paper mass of a printout (HMM)]% %% Allows to compute the number of sheets of paper %% needed to print a document as well as the %% mass of that printed version of the document, -%% usefull e. g. when sending it by mail to determine the postage. +%% useful e. g. when sending it by mail to determine the postage. %% Warning/Disclaimer: Mass of (printer's) ink has to be added %% (and that of envelope, address sticker, stamps,...)! %% So, this is only an estimation without guarantee - @@ -52,7 +52,7 @@ %% "base to the power of exponent" inside TeX. \RequirePackage{kvoptions}[2010/02/22]% v3.7 -\RequirePackage{pagesLTS}[2010/06/03]% v1.1b +\RequirePackage{pagesLTS}[2010/06/24]% v1.1c %% papermas may work with earlier versions of those packages, %% but this was not tested. Please consider updating your packages %% to the most recent version (if they are not already the most @@ -65,6 +65,9 @@ % default: 80 (g/(m^2)) \DeclareStringOption[2]{pagespersheet}[2]% number of pages per sheet, % for duplex printing this is 2. +\DeclareStringOption[.]{decimalsep}[.]% decimal separator, + % e. g. "." or ",": decimalsep={,} - brackets are needed!!! + % decimalsep={,\,} does not work for screen, aux, log output! \ProcessKeyvalOptions* @@ -146,7 +149,7 @@ \PackageError{papermas}{% The number of pages per sheet must be positive.}{% You cannot print less than one TeX page per sheet of paper.\MessageBreak% - The value found was \papermas@pagespersheet .\ \MessageBreak% + The value found was \papermas@pagespersheet .\MessageBreak% } \else \newcounter{papermas@sheets} @@ -161,7 +164,7 @@ \addtocounter{papermas@sheets}{1}% \fi \multiply \value{papermasmasss} \value{papermas@sheets} - % default: 8000 + % default: 8000 (no default for this) \papermas@powerof{2}{\value{papermasA}} \divide \value{papermasmasss} by \value{papermas@result} % default: 16000 / 2^(\value{papermasA}) @@ -190,7 +193,7 @@ \setcounter{papermas@tmpp}{0}% m:290 n:20 o:3 p:0 q:7 \fi \fi - \edef\papermastmpr{\arabic{papermas@tmpo}.\arabic{papermas@tmpp}}% + \edef\papermastmpr{\arabic{papermas@tmpo}\papermas@decimalsep\arabic{papermas@tmpp}}% \edef\papermastmpformat{\papermas@format}% \edef\papermastmpmasss{\papermas@masss}% \edef\papermastmppagespersheet{\papermas@pagespersheet}% diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 7b2a6882f48..72f86902922 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -20,7 +20,7 @@ sub main # list format: pkg1|pkg2|etc $erroneous_tds = join ("|", qw(engpron fmtcount imtekda paresse purifyeps thailatex tufte-latex xetexref xtab), - qw(pageslts)); + qw(pageslts papermas papertex undolab)); # muench # Heiko's tds files (don't propagate through CTAN fast enough). $oberdiek_tds = "hyperref|oberdiek"; -- cgit v1.2.3