From fe6f73e8a6e7202bba968b7db2c378b3fefc3129 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Feb 2011 01:09:59 +0000 Subject: papers (1feb11) git-svn-id: svn://tug.org/texlive/trunk@21258 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/papermas/README | 19 +- Master/texmf-dist/doc/latex/papermas/ltxdoc.cfg | 2 +- .../doc/latex/papermas/papermas-example.pdf | Bin 103773 -> 83278 bytes .../doc/latex/papermas/papermas-example.tex | 6 +- Master/texmf-dist/doc/latex/papermas/papermas.pdf | Bin 470161 -> 360803 bytes .../texmf-dist/source/latex/papermas/papermas.drv | 8 +- .../texmf-dist/source/latex/papermas/papermas.dtx | 218 ++++++++------------- .../texmf-dist/source/latex/papermas/papermas.ins | 14 +- Master/texmf-dist/tex/latex/papermas/papermas.sty | 29 +-- Master/tlpkg/libexec/ctan2tds | 2 + 10 files changed, 120 insertions(+), 178 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/papermas/README b/Master/texmf-dist/doc/latex/papermas/README index b05567954ef..5fa74fc9203 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/07/29, v1.0d +README for papermas package, 2011/02/01, v1.0e TABLE OF CONTENTS @@ -19,7 +19,7 @@ TABLE OF CONTENTS ============== This package allows to compute the mass of a printed version of a -document, useful 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 @@ -70,20 +70,17 @@ Manual installation ------------------- a) Download the papermas files from CTAN or the TUG server. If necessary, unpack them. -b) If directory `beta' exists, replace the files by the - counterparts in this directory, if you want to use the - latest versions. -c) Generate the package and driver files: +b) Generate the package and driver files: tex papermas.ins -d) Install the files `*.sty', and `*.cfg' in your TDS tree: - cp *.sty *.cfg TDS:tex/latex/muench/papermas/ +c) Install the files `*.sty', and `*.cfg' in your TDS tree: + cp *.sty *.cfg TDS:tex/latex/papermas/ Replace `TDS:' by the prefix of your TDS tree (texmf directory). -e) Copy the documentation files to - "TDS:doc/latex/muench/papermas/": +d) Copy the documentation files to + "TDS:doc/latex/papermas/": README, papermas.pdf, papermas-example.tex, papermas-example.pdf. -f) Update the databases if necessary, e. g. for teTeX: +e) Update the databases if necessary, e. g. for teTeX: mktexlsr .../texmf diff --git a/Master/texmf-dist/doc/latex/papermas/ltxdoc.cfg b/Master/texmf-dist/doc/latex/papermas/ltxdoc.cfg index cd1b1462b9f..306111f4a19 100644 --- a/Master/texmf-dist/doc/latex/papermas/ltxdoc.cfg +++ b/Master/texmf-dist/doc/latex/papermas/ltxdoc.cfg @@ -37,7 +37,7 @@ %% papermas-example.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesFile{ltxdoc.cfg}[2010/05/15 v1.0 configuration file for papermas (HMM)] +\ProvidesFile{ltxdoc.cfg}[2011/02/01 v1.0b configuration file for papermas (HMM)] %% Code from original ltxdoc.cfg [2007/01/08 latex-tds: ltxdoc.cls configuration (HO)], %% % copyrighted 2006, 2007 Heiko Oberdiek, part of project `latex-tds'. % That file may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/papermas/papermas-example.pdf b/Master/texmf-dist/doc/latex/papermas/papermas-example.pdf index 9a39cd81776..25742e3a8bc 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 4e84b6b6885..132d0f4d12a 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/06/18]% v6.81g +\usepackage{hyperref}[2010/12/16]% v6.81z \hypersetup{% extension=pdf,% plainpages=false,% @@ -55,7 +55,7 @@ bookmarksopen=false% } \usepackage{alphalph}[2010/04/18]% v2.3 -\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/07/29]% v1.1e +\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2011/02/01]% v1.1m %% These are the default options. %% \usepackage[format=4,masss=80,pagespersheet=2,decimalsep={.}]{papermas} %% These are the default options. %% @@ -67,7 +67,7 @@ \markboth{Example for papermas}{Example for papermas} This example demonstrates the use of package\newline -\textsf{papermas}, v1.0d as of 2010/07/29 (HMM).\newline +\textsf{papermas}, v1.0e as of 2011/02/01 (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 f2139d9e26b..625377fb5f9 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 49a0d192c7a..d4c11d2afec 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/07/29 v1.0d% +\ProvidesFile{papermas.drv}[2011/02/01 v1.0e Computes paper mass of a printout (HMM)]% \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2010/04/24]% v0.19 @@ -48,11 +48,11 @@ %% 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/06/18 v6.81g) +%% hyperref, 2010/03/30, v6.80u (latest: 2010/12/16, v6.81z) %% pdftexcmds, 2010/04/01, v0.9 %% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) %% hologo, 2010/04/24, v1.2 -%% array (latest: 2008/09/09, v2.4c) +%% array (latest: 2008/09/09, v2.4c) %% (or more recent versions) and does neither work with %% nor check for earlier versions! \hypersetup{% @@ -77,10 +77,10 @@ \EnableCrossrefs \hyphenation{created document docu-menta-tion every-thing ignored} \makeatletter +\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% %% Code from tcilatex.tex, Macros for Scientific Word and Scientific WorkPlace 5.5 <06 Oct 2005> %% %% Copyright (C) 2005 Mackichan Software, Inc. %% %% That macro file is NOT proprietary and may be freely copied and distributed. %% - \def\unit#1{\mathord{\thinspace\rm #1}}% \def\RIfM@{\relax\protect\ifmmode} \def\text{\RIfM@\expandafter\text@\else\expandafter\mbox\fi} \let\nfss@text\text diff --git a/Master/texmf-dist/source/latex/papermas/papermas.dtx b/Master/texmf-dist/source/latex/papermas/papermas.dtx index eb976cbe259..95a926b0fba 100644 --- a/Master/texmf-dist/source/latex/papermas/papermas.dtx +++ b/Master/texmf-dist/source/latex/papermas/papermas.dtx @@ -1,11 +1,11 @@ % \iffalse meta-comment % % papermas package -% file version: v1.0d -% file date: 2010/07/29 -% documentation date: 2010/07/29 +% file version: v1.0e +% file date: 2011/02/01 +% documentation date: 2011/02/01 % -% Copyright (C) 2010 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de) +% Copyright (C) 2010, 2011 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de) % Portions of code copyrighted by other people as marked. % % This work may be distributed and/or modified under the @@ -55,20 +55,11 @@ % use DIN A4 as paper format: % \PassOptionsToClass{a4paper}{article} % -% Programm calls to get the documentation (for example): -% pdflatex papermas.dtx -% makeindex -s gind.ist papermas.idx -% % makeindex -s gglo.ist -o papermas.gls papermas.glo -% pdflatex papermas.dtx -% makeindex -s gind.ist papermas.idx -% % makeindex -s gglo.ist -o papermas.gls papermas.glo -% pdflatex papermas.dtx -% % Installation: -% TDS:tex/latex/muench/papermas/papermas.sty -% TDS:doc/latex/muench/papermas/papermas.pdf -% TDS:doc/latex/muench/papermas/papermas-example.tex -% TDS:source/latex/muench/papermas/papermas.dtx +% TDS:tex/latex/papermas/papermas.sty +% TDS:doc/latex/papermas/papermas.pdf +% TDS:doc/latex/papermas/papermas-example.tex +% TDS:source/latex/papermas/papermas.dtx % %<*ignore> \begingroup @@ -85,7 +76,7 @@ \obeyspaces \Msg{******************************************************} \Msg{* Installation *} -\Msg{* Package: papermas v1.0d 2010/07/29 LaTeX2e package *} +\Msg{* Package: papermas v1.0e 2011/02/01 LaTeX2e package *} \Msg{* Computes paper mass of a printout (HMM) *} \Msg{******************************************************} @@ -132,9 +123,9 @@ and the derived files \file{papermas.ins}{\from{papermas.dtx}{install}}% \file{papermas.drv}{\from{papermas.dtx}{driver}}% \file{ltxdoc.cfg}{\from{papermas.dtx}{ltxdoc}}% - \usedir{tex/latex/muench/papermas}% + \usedir{tex/latex/papermas}% \file{papermas.sty}{\from{papermas.dtx}{package}}% - \usedir{doc/latex/muench/papermas}% + \usedir{doc/latex/papermas}% \file{papermas-example.tex}{\from{papermas.dtx}{example}}% } @@ -147,12 +138,12 @@ and the derived files \Msg{* papermas.sty *} \Msg{* *} \Msg{* To produce the documentation run the file `papermas.drv' *} -\Msg{* through (pdf)LaTeX, e. g. *} -\Msg{* pdflatex papermas.dtx *} +\Msg{* through (pdf)LaTeX, e.g. *} +\Msg{* pdflatex papermas.drv *} \Msg{* makeindex -s gind.ist papermas.idx *} -\Msg{* pdflatex papermas.dtx *} +\Msg{* pdflatex papermas.drv *} \Msg{* makeindex -s gind.ist papermas.idx *} -\Msg{* pdflatex papermas.dtx *} +\Msg{* pdflatex papermas.drv *} \Msg{* *} \Msg{* At least two runs are necessary e. g. to get the *} \Msg{* references right! *} @@ -180,7 +171,7 @@ and the derived files % \begin{macrocode} %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesFile{papermas.drv}[2010/07/29 v1.0d% +\ProvidesFile{papermas.drv}[2011/02/01 v1.0e Computes paper mass of a printout (HMM)]% \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2010/04/24]% v0.19 @@ -191,11 +182,11 @@ 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/06/18 v6.81g) +%% hyperref, 2010/03/30, v6.80u (latest: 2010/12/16, v6.81z) %% pdftexcmds, 2010/04/01, v0.9 %% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) %% hologo, 2010/04/24, v1.2 -%% array (latest: 2008/09/09, v2.4c) +%% array (latest: 2008/09/09, v2.4c) %% (or more recent versions) and does neither work with %% nor check for earlier versions! \hypersetup{% @@ -224,10 +215,10 @@ and the derived files %\OnlyDescription % Comment out for implementation details. \hyphenation{created document docu-menta-tion every-thing ignored} \makeatletter +\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% %% Code from tcilatex.tex, Macros for Scientific Word and Scientific WorkPlace 5.5 <06 Oct 2005> %% %% Copyright (C) 2005 Mackichan Software, Inc. %% %% That macro file is NOT proprietary and may be freely copied and distributed. %% - \def\unit#1{\mathord{\thinspace\rm #1}}% % These macros are for doing the AMS \text{} construct \def\RIfM@{\relax\protect\ifmmode} \def\text{\RIfM@\expandafter\text@\else\expandafter\mbox\fi} @@ -255,7 +246,7 @@ and the derived files % \begin{macrocode} %<*ltxdoc> \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesFile{ltxdoc.cfg}[2010/05/15 v1.0 configuration file for papermas (HMM)] +\ProvidesFile{ltxdoc.cfg}[2011/02/01 v1.0b configuration file for papermas (HMM)] %% Code from original ltxdoc.cfg [2007/01/08 latex-tds: ltxdoc.cls configuration (HO)], %% % copyrighted 2006, 2007 Heiko Oberdiek, part of project `latex-tds'. % That file may be distributed and/or modified under the @@ -321,7 +312,7 @@ and the derived files % % \fi % -% \CheckSum{369} +% \CheckSum{349} % % \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 @@ -375,11 +366,11 @@ and the derived files % \DoNotIndex{\markboth,\M"{u}ench,\section,\totpages} % % \title{The \textsf{papermas} package\footnote{This file% -% has version number v1.0d, last% -% revised 2010/07/29, documentation dated 2010/07/29.}} +% has version number v1.0e, last% +% revised 2011/02/01, documentation dated 2011/02/01.}} % \author{H.-Martin M\"{u}nch\\ % (\texttt{Martin dot Muench at Uni-Bonn dot de})} -% \date{2010/07/29} +% \date{2011/02/01} % % \maketitle % @@ -449,7 +440,7 @@ and the derived files % |\usepackage[<|\textit{options}|>]{papermas}| % \end{quote} % \noindent in the preamble of your \LaTeXe\ source file -% (preferrrably after calling the \textsf{pagesLTS} package).\\ +% (preferably after calling the \textsf{pagesLTS} package).\\ % Because the \textsf{pagesLTS} package is used to get the total % number of pages, please place a |\pagenumbering{...}| with % appropriate argument (e.\,g.~arabic, roman, Roman, fnsymbol, @@ -555,7 +546,7 @@ and the derived files %<*example> \documentclass[british,a4paper]{article} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\usepackage{hyperref}[2010/06/18]% v6.81g +\usepackage{hyperref}[2010/12/16]% v6.81z \hypersetup{% extension=pdf,% plainpages=false,% @@ -572,7 +563,7 @@ 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/07/29]% v1.1e +\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2011/02/01]% v1.1m %% These are the default options. %% \usepackage[format=4,masss=80,pagespersheet=2,decimalsep={.}]{papermas} %% These are the default options. %% @@ -584,7 +575,7 @@ and the derived files \markboth{Example for papermas}{Example for papermas} This example demonstrates the use of package\newline -\textsf{papermas}, v1.0d as of 2010/07/29 (HMM).\newline +\textsf{papermas}, v1.0e as of 2011/02/01 (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, @@ -689,7 +680,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/07/29 v1.0d +\ProvidesPackage{papermas}[2011/02/01 v1.0e Computes paper mass of a printout (HMM)]% % \end{macrocode} @@ -721,7 +712,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/07/29]% v1.1e +\RequirePackage{pagesLTS}[2011/02/01]% v1.1m % \end{macrocode} % % A last information for the user(s): @@ -754,16 +745,10 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \end{macrocode} % % \begin{macro}{unit} -% We want to use the |\unit| command from {\sl Scientific WorkPlace\/}, -% therefore we need to copy the definition: +% We define a |\unit| command similar to the one from {\sl Scientific WorkPlace\/}: % % \begin{macrocode} -%% Code from tcilatex.tex, Macros for Scientific Word and Scientific WorkPlace 5.5 <06 Oct 2005> %% -%% Copyright (C) 2005 Mackichan Software, Inc. %% -%% That macro file is NOT proprietary and may be freely copied and distributed. %% -%% \def was changed to \gdef %% - \gdef\unit#1{\mathord{\thinspace\rm #1}}% -%% End of code from tcilatex.tex %% +\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% % \end{macrocode} % \end{macro} @@ -774,18 +759,12 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \LaTeX \texttt{\ Error:~\ldots\ undefined}. % % \begin{macrocode} -\ifx\papermasstotal\undefined \gdef\papermasstotal{\textbf{??}}% -\fi -\ifx\papermasstotal\undefined \gdef\papermasstotal{\textbf{??}}% -\fi -\ifx\papermasformat\undefined \gdef\papermasformat{\textbf{??}}% -\fi -\ifx\papermasmasss\undefined \gdef\papermasmasss{\textbf{??}}% -\fi -\ifx\papermaspagespersheet\undefined \gdef\papermaspagespersheet{\textbf{??}}% -\fi -\ifx\papermassheets\undefined \gdef\papermassheets{\textbf{??}}% -\fi +\@ifundefined{papermasstotal}{\gdef\papermasstotal{\textbf{??}}}{} +\@ifundefined{papermasstotal}{\gdef\papermasstotal{\textbf{??}}}{} +\@ifundefined{papermasformat}{\gdef\papermasformat{\textbf{??}}}{} +\@ifundefined{papermasmasss}{\gdef\papermasmasss{\textbf{??}}}{} +\@ifundefined{papermaspagespersheet}{\gdef\papermaspagespersheet{\textbf{??}}}{} +\@ifundefined{papermassheets}{\gdef\papermassheets{\textbf{??}}}{} % \end{macrocode} % @@ -1267,7 +1246,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \subsection{Downloads\label{ss:Downloads}} % -% Everything should be available on \CTAN{}, \url{ftp://ftp.ctan.org/tex-archive/}, +% Everything is available on \CTAN{}, \url{ftp://ftp.ctan.org/tex-archive/}, % but may need additional packages themselves.\\ % % \DescribeMacro{papermas.dtx} @@ -1294,7 +1273,7 @@ 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/07/29, v1.1e,\\ +% \item[-] package \textsf{pagesLTS}, 2011/02/01, v1.1m,\\ % \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx}\\ % \end{description} % @@ -1302,7 +1281,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % The |papermas-example.tex| requires the same files as all % documents using the \textsf{papermas} package, especially: % \begin{description} -% \item[-] package \textsf{papermas}, 2010/07/29, v1.0d,\\ +% \item[-] package \textsf{papermas}, 2011/02/01, v1.0e,\\ % \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 @@ -1327,11 +1306,11 @@ 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/06/18, v6.81g) +% \item[-] hyperref, 2010/03/30, v6.80u (latest: 2010/12/16, v6.81z) % \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 -% \item[-] array (latest: 2008/09/09, v2.4c) +% \item[-] array (latest: 2008/09/09, v2.4c) % \end{description} % (or more recent versions) and does neither work with % nor check for earlier versions!\\ @@ -1340,77 +1319,41 @@ 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 (alphabetically ordered):\\ -% \begin{description} -% \item[hrefhide] 2010/07/29, v1.0d, \CTAN{macros/latex/contrib/hrefhide/hrefhide.dtx} and -% \CTAN{install/macros/latex/contrib/hrefhide.tds.zip}\\ -% That package allows to \textquotedblleft hide\textquotedblright\ some (hyperlinked) -% text when printing the document while keeping the layout. -% -% \item[lastpage] 2010/07/29, v1.2a, \CTAN{macros/latex/contrib/lastpage/lastpage.dtx} and -% \CTAN{install/macros/latex/contrib/lastpage.tds.zip}\\ -% That package allows to refer to the (maybe not so) last page. -% \textit{The package was originally invented by Jeffrey P. Goldberg.} -% The \textsf{pagesLTS} package is much more mighty, but needs more resources -% (e.\,g.~new counters).\\ -% \textbf{Submitted to CTAN.} -% -% \item[pagesLTS] 2010/07/29, v1.1e, \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx} and -% \CTAN{install/macros/latex/contrib/pagesLTS.tds.zip}\\ -% 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/07/29, v1.0d, \CTAN{macros/latex/contrib/papermas/papermas.dtx} and -% \CTAN{install/macros/latex/contrib/papermas.tds.zip}\\ -% The package described in this very documentation:\\ -% 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. -% Further that package allows to compute \textquotedblleft base to the power of -% exponent\textquotedblright\ inside \LaTeX. -% -% \item[undolabl] 2010/07/29, v1.0f, \CTAN{macros/latex/contrib/undolabl/undolabl.dtx} and -% \CTAN{install/macros/latex/contrib/undolabl.tds.zip}\\ -% That package allows to override existing labels, especially automatically generated ones.\\ -% \textit{The main code of that package was invented by }\\ -% \textbf{Ulrich Diez} (\texttt{eu\_angelion@web.de})\textit{\ and first published in the } -% \Newsgroup{comp.text.tex} \textit{\ newsgroup at}\\ -% \texttt{Sun,~20~Apr~2008~16:39:26~+0200}\textit{, with subject:}\\ -% \texttt{Re:~How~to~undefine/overwrite~a~label?}\textit{\ (see e.\,g.\ } -% \url{http://groups.google.de/group/comp.text.tex/msg/5ba8d4722e5cd326?dmode=source} -% \textit{\ as well as\ } -% \url{http://groups.google.de/group/comp.text.tex/msg/af6cfe93917097da?dmode=source}\textit{).}\\ -% \end{description} +% A list of my packages can be found at\\ +% \url{http://www.Uni-Bonn.de/~uzs5pv/LaTeX.html}.\\ % % \subsection{Package, unpacking TDS} % % \paragraph{Package.} This package is available on \CTAN{}: % \begin{description} % \item[\CTAN{macros/latex/contrib/papermas/papermas.dtx}]\hspace*{0.1cm} \\ -% The source file. -% \item[\CTAN{macros/latex/contrib/papermas/papermas.ins}]\hspace*{0.1cm} \\ -% The installation file. -% \item[\CTAN{macros/latex/contrib/papermas/papermas.drv}]\hspace*{0.1cm} \\ -% The driver to generate the documentation. -% \item[\CTAN{macros/latex/contrib/papermas/ltxdoc.cfg}]\hspace*{0.1cm} \\ -% The \LaTeX documentation configuration file, also for generating the documentation. +% The source file. % \item[\CTAN{macros/latex/contrib/papermas/papermas.pdf}]\hspace*{0.1cm} \\ -% The documentation. -% \item[\CTAN{macros/latex/contrib/papermas/papermas.sty}]\hspace*{0.1cm} \\ -% The \xext{sty}le file. -% \item[\CTAN{macros/latex/contrib/papermas/papermas-example.tex}]\hspace*{0.1cm} \\ -% The example file. +% The documentation. % \item[\CTAN{macros/latex/contrib/papermas/papermas-example.pdf}]\hspace*{0.1cm} \\ -% The compiled example file, as it should look like. +% The compiled example file, as it should look like. +% \item[\CTAN{macros/latex/contrib/papermas/README}]\hspace*{0.1cm} \\ +% The README file. +% \end{description} +% There is also a papermas.tds.zip available: +% \begin{description} % \item[\CTAN{install/macros/latex/contrib/papermas.tds.zip}]\hspace*{0.1cm} \\ -% Everything in TDS compliant, compiled format (submitted, should become available soon). +% Everything in TDS compliant, compiled format. % \end{description} +% which additionally contains\\ +% \begin{tabular}{ll} +% papermas.ins & The installation file.\\ +% papermas.drv & The driver to generate the documentation.\\ +% ltxdoc.cfg & The \LaTeX\ documentation configuration file,\\ +% & also for generating the documentation.\\ +% papermas.sty & The \xext{sty}le file.\\ +% papermas-example.tex & The example file.% +% \end{tabular} % -% For required other packages, see the preceding subsection. +% \bigskip +% +% \noindent For required other packages, see the preceding subsection. % % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting % \docstrip\ archive. The files are extracted by running the @@ -1427,11 +1370,11 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \begin{quote} % \def\t{^^A % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} -% papermas.sty & tex/latex/muench/papermas.sty\\ -% papermas.pdf & doc/latex/muench/papermas.pdf\\ -% papermas-example.tex & doc/latex/muench/papermas-example.tex\\ -% papermas-example.pdf & doc/latex/muench/papermas-example.pdf\\ -% papermas.dtx & source/latex/muench/papermas.dtx\\ +% papermas.sty & tex/latex/papermas.sty\\ +% papermas.pdf & doc/latex/papermas.pdf\\ +% papermas-example.tex & doc/latex/papermas-example.tex\\ +% papermas-example.pdf & doc/latex/papermas-example.pdf\\ +% papermas.dtx & source/latex/papermas.dtx\\ % \end{tabular}^^A % }^^A % \sbox0{\t}^^A @@ -1534,11 +1477,11 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \begin{quote} %\begin{verbatim} -%pdflatex papermas.dtx +%pdflatex papermas.drv %makeindex -s gind.ist papermas.idx -%pdflatex papermas.dtx +%pdflatex papermas.drv %makeindex -s gind.ist papermas.idx -%pdflatex papermas.dtx +%pdflatex papermas.drv %\end{verbatim} % \end{quote} % @@ -1574,7 +1517,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \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.) +% (TDS was 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. @@ -1586,6 +1529,17 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \item There is a new version of the used \textsf{pagesLTS} package: 2010/07/29,~v1.1e. % \item Included a |\CheckSum|. % \end{Version} +% \begin{Version}{2011/02/01 v1.0e} +% \item Updated to version 2010/12/16 v6.81z of the \textsf{hyperref} package. +% \item Removed wrong \%\ from the driver file. +% \item Changed the |\unit| definition (got rid of an old |\rm|). +% \item Replaced the list of my packages with a link to a web page list of those, +% which has the advantage of showing the recent versions of all those packages. +% \item Now using |\@ifundefined|. +% \item Removed |/muench/| from the path at diverse locations. +% \item There is a new version of the used \textsf{pagesLTS} package: 2011/02/01,~v1.1m. +% \item Some small changes. +% \end{Version} % \end{History} % % % \PrintChanges diff --git a/Master/texmf-dist/source/latex/papermas/papermas.ins b/Master/texmf-dist/source/latex/papermas/papermas.ins index 422a355747c..abbf72f3541 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.0d 2010/07/29 LaTeX2e package *} +\Msg{* Package: papermas v1.0e 2011/02/01 LaTeX2e package *} \Msg{* Computes paper mass of a printout (HMM) *} \Msg{******************************************************} @@ -88,9 +88,9 @@ and the derived files \file{papermas.ins}{\from{papermas.dtx}{install}}% \file{papermas.drv}{\from{papermas.dtx}{driver}}% \file{ltxdoc.cfg}{\from{papermas.dtx}{ltxdoc}}% - \usedir{tex/latex/muench/papermas}% + \usedir{tex/latex/papermas}% \file{papermas.sty}{\from{papermas.dtx}{package}}% - \usedir{doc/latex/muench/papermas}% + \usedir{doc/latex/papermas}% \file{papermas-example.tex}{\from{papermas.dtx}{example}}% } @@ -103,12 +103,12 @@ and the derived files \Msg{* papermas.sty *} \Msg{* *} \Msg{* To produce the documentation run the file `papermas.drv' *} -\Msg{* through (pdf)LaTeX, e. g. *} -\Msg{* pdflatex papermas.dtx *} +\Msg{* through (pdf)LaTeX, e.g. *} +\Msg{* pdflatex papermas.drv *} \Msg{* makeindex -s gind.ist papermas.idx *} -\Msg{* pdflatex papermas.dtx *} +\Msg{* pdflatex papermas.drv *} \Msg{* makeindex -s gind.ist papermas.idx *} -\Msg{* pdflatex papermas.dtx *} +\Msg{* pdflatex papermas.drv *} \Msg{* *} \Msg{* At least two runs are necessary e. g. to get the *} \Msg{* references right! *} diff --git a/Master/texmf-dist/tex/latex/papermas/papermas.sty b/Master/texmf-dist/tex/latex/papermas/papermas.sty index acaaf198386..834ff5f5a72 100644 --- a/Master/texmf-dist/tex/latex/papermas/papermas.sty +++ b/Master/texmf-dist/tex/latex/papermas/papermas.sty @@ -37,7 +37,7 @@ %% papermas-example.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesPackage{papermas}[2010/07/29 v1.0d +\ProvidesPackage{papermas}[2011/02/01 v1.0e Computes paper mass of a printout (HMM)]% %% Allows to compute the number of sheets of paper @@ -52,7 +52,7 @@ %% "base to the power of exponent" inside TeX. \RequirePackage{kvoptions}[2010/02/22]% v3.7 -\RequirePackage{pagesLTS}[2010/07/29]% v1.1e +\RequirePackage{pagesLTS}[2011/02/01]% v1.1m %% 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 @@ -71,25 +71,14 @@ \ProcessKeyvalOptions* -%% Code from tcilatex.tex, Macros for Scientific Word and Scientific WorkPlace 5.5 <06 Oct 2005> %% -%% Copyright (C) 2005 Mackichan Software, Inc. %% -%% That macro file is NOT proprietary and may be freely copied and distributed. %% -%% \def was changed to \gdef %% - \gdef\unit#1{\mathord{\thinspace\rm #1}}% -%% End of code from tcilatex.tex %% +\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% -\ifx\papermasstotal\undefined \gdef\papermasstotal{\textbf{??}}% -\fi -\ifx\papermasstotal\undefined \gdef\papermasstotal{\textbf{??}}% -\fi -\ifx\papermasformat\undefined \gdef\papermasformat{\textbf{??}}% -\fi -\ifx\papermasmasss\undefined \gdef\papermasmasss{\textbf{??}}% -\fi -\ifx\papermaspagespersheet\undefined \gdef\papermaspagespersheet{\textbf{??}}% -\fi -\ifx\papermassheets\undefined \gdef\papermassheets{\textbf{??}}% -\fi +\@ifundefined{papermasstotal}{\gdef\papermasstotal{\textbf{??}}}{} +\@ifundefined{papermasstotal}{\gdef\papermasstotal{\textbf{??}}}{} +\@ifundefined{papermasformat}{\gdef\papermasformat{\textbf{??}}}{} +\@ifundefined{papermasmasss}{\gdef\papermasmasss{\textbf{??}}}{} +\@ifundefined{papermaspagespersheet}{\gdef\papermaspagespersheet{\textbf{??}}}{} +\@ifundefined{papermassheets}{\gdef\papermassheets{\textbf{??}}}{} \newcounter{papermas@rerun} \newcounter{papermas@base} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 6b64ee418a2..8f462b7ff40 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1544,6 +1544,7 @@ $standardsource='\.(c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh'; 'namespc', 'namespc.dtx', 'pageslts', 'pagesLTS.dtx', 'paper', 'install', + 'papermas', "$package.dtx", 'parrun', 'parrun.ins', 'seuthesis', 'NULL', # don't want to run iconv, etc. 'stmaryrd', 'stmaryrd.dtx', @@ -1596,6 +1597,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'nomentbl' => 'latex -translate-file=empty.tcx', # no 8-bit 'thumb' => 'latex -translate-file=empty.tcx', # no 8-bit 'pageslts' => 'tex -translate-file=empty.tcx', # no 8-bit + 'papermas', => 'tex', 'pauldoc' => 'latex', # requires interaction 'polski' => 'latex', # requires interaction 'psfragx' => 'latex', # requires interaction -- cgit v1.2.3