oberdiek as always, infwarerr v1.0 new and updates

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

1 files changed, 19 insertions, 77 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty
index b7e9d0b6a05..264c0712954 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2001, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2001, 2006, 2007 by
+%%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -87,62 +88,31 @@
   }%
 }{}
 
-\@ifundefined{PackageError}{%
-  \def\PackageError#1#2#3{%
-    \begingroup
-      \newlinechar=10 %
-      \errhelp{#3}%
-      \errmessage{%
-        \MessageBreak
-        Package #1 Error: #2.\MessageBreak
-        \MessageBreak
-        See the #1 package documentation for explanation.\MessageBreak
-        Type \space H <return> \space for immediate help%
-      }%
-    \endgroup
-  }%
-}{}
-
-\@ifundefined{PackageWarning}{%
-  \def\PackageWarning#1#2{%
-    \begingroup
-      \newlinechar=10 %
-      \def\MessageBreak{%
-        ^^J(#1)\@spaces\@spaces\@spaces\@spaces
-      }%
-      \immediate\write16{^^JPackage #1 Warning: #2\on@line.^^J}%
-    \endgroup
-  }%
-}{}
-
-\@ifundefined{PackageWarningNoLine}{%
-  \def\PackageWarningNoLine#1#2{%
-    \PackageWarning{#1}{#2\@gobble}%
-  }%
-}{}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input infwarerr.sty\relax
+\else
+  \RequirePackage{infwarerr}%
+\fi
 
 \@ifundefined{@gobble}{%
   \long\def\@gobble#1{}%
 }{}
 
-\@ifundefined{on@line}{%
-  \def\on@line{ on input line \the\inputlineno}%
-}{}
-
 \@ifundefined{@empty}{%
   \def\@empty{}%
 }{}
 \ProvidesPackage{pdfcrypt}%
-  [2007/04/11 v0.9 Setting pdf encryption (HO)]%
+  [2007/04/26 v1.0 Setting pdf encryption (HO)]%
 \@ifundefined{pdfcryptsetup}{%
   \let\pdfcryptsetup\@gobble
 }{%
-  \PackageWarningNoLine{pdfcrypt}{Package pdfcrypt is already loaded}%
+  \@PackageWarningNoLine{pdfcrypt}{Package pdfcrypt is already loaded}%
   \pc@endinput
 }
 \newif\ifpc@nopdfcrypt
 \ifx Y\nopdfcrypt
-  \PackageWarningNoLine{pdfcrypt}{%
+  \@PackageWarningNoLine{pdfcrypt}{%
     Encryption disabled by \string \nopdfcrypt\space request%
   }%
   \global\pc@nopdfcrypttrue
@@ -155,7 +125,7 @@
     \ifcase\pdfoutput
     \else
       \@ifundefined{pdfcrypt}{%
-        \PackageError{pdfcrypt}{%
+        \@PackageError{pdfcrypt}{%
           PDF encryption is not supported with this pdfTeX%
         }{%
           Encryption support was added in 0.14h (2001/03/10)\MessageBreak
@@ -173,7 +143,7 @@
   }{%
     \ifnum\OpMode=1 %
       \ifnum\@ifundefined{VTeXversion}0\VTeXversion<735 %
-        \PackageError{pdfcrypt}{%
+        \@PackageError{pdfcrypt}{%
           PDF encryption is not supported with this VTeX%
         }{%
           You need VTeX 7.35 or higher.%
@@ -207,34 +177,6 @@
   \def\@nameuse#1{\csname #1\endcsname}%
 }{}
 
-\@ifundefined{MessageBreak}{%
-  \def\MessageBreak{^^J}%
-}{}
-
-\@ifundefined{@ehc}{%
-  \def\@ehc{%
-    Try typing \space <return> \space to proceed.\MessageBreak
-    If that doesn't work, type \space X <return> \space
-    to quit.%
-  }%
-}{}
-
-\@ifundefined{PackageInfo}{%
-  \def\PackageInfo#1#2{%
-    \begingroup
-      \newlinechar=10 %
-      \def\MessageBreak{%
-        ^^J(#1) \space\@spaces\@spaces\@spaces
-      }%
-      \wlog{Package #1 Info: #2}%
-    \endgroup
-  }%
-}{}
-
-\@ifundefined{@spaces}{%
-  \def\@spaces{\space\space\space\space}%
-}{}
-
 \def\pc@KeyvalRestore{%
   \let\pc@KeyvalRestore\@undefined
 }
@@ -300,7 +242,7 @@
 \edef\pc@temp{\catcode`\noexpand\"=\the\catcode`\"\relax}
 \@makeother\"
 \def\pc@set{%
-  \PackageInfo{pdfcrypt}{%
+  \@PackageInfo{pdfcrypt}{%
     \ifpc@debug
       \ifx\pc@owner\@empty
         No owner password%
@@ -331,10 +273,10 @@
   \else
     \@ifundefined{pc@set@\pc@driver}{%
       \ifx\pc@driver\@empty
-        \PackageError{pdfcrypt}{No driver for encryption %
+        \@PackageError{pdfcrypt}{No driver for encryption %
           support found}\@ehc
       \else
-        \PackageError{pdfcrypt}{Cannot set encryption for %
+        \@PackageError{pdfcrypt}{Cannot set encryption for %
           unknown driver `\pc@driver'}\@ehc
       \fi
     }{%
@@ -440,7 +382,7 @@
     \fi
   \fi
   \ifx\pc@temp\relax
-    \PackageWarning{pdfcrypt}{%
+    \@PackageWarning{pdfcrypt}{%
       Unexpected value \string`#3\string' of %
       option \string`#2\string'\MessageBreak
       instead of %
@@ -503,7 +445,7 @@
     \pc@set
     \global\let\pc@set\relax
     \gdef\pdfcryptsetup##1{%
-      \PackageWarning{pdfcrypt}{%
+      \@PackageWarning{pdfcrypt}{%
         Encryption options are already set\MessageBreak
         new values are ignored%
       }%
@@ -517,7 +459,7 @@
 \fi
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname InputIfFileExists\endcsname\relax
-  \PackageInfo{pdfcrypt}{%
+  \@PackageInfo{pdfcrypt}{%
     Configuration file pdfcrypt.cfg not supported.%
   }%
 \else