summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/papermas
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-02 01:09:59 +0000
committerKarl Berry <karl@freefriends.org>2011-02-02 01:09:59 +0000
commitfe6f73e8a6e7202bba968b7db2c378b3fefc3129 (patch)
treeed6f31f97b809f5ebe4af38a3abcbe8c72fdfdf4 /Master/texmf-dist/tex/latex/papermas
parenteab6d7d5d02b3de8c4e17da89873e9b817f87114 (diff)
papers (1feb11)
git-svn-id: svn://tug.org/texlive/trunk@21258 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/papermas')
-rw-r--r--Master/texmf-dist/tex/latex/papermas/papermas.sty29
1 files changed, 9 insertions, 20 deletions
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}