From 960967cf105bdfe5b6ef819520fa40f481db97bd Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 28 Jul 2012 15:17:41 +0000
Subject: koma-script (5jul12)

git-svn-id: svn://tug.org/texlive/trunk@27218 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/koma-script/scrlfile.sty   | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/koma-script/scrlfile.sty')

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 7ce524a34c4..98982fb25e2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -41,7 +41,7 @@
 %% standard classes created by The LaTeX3 Project 1994-1996.
 %% 
 %%% From File: scrlfile.dtx
-\def\scrlfileversion{2011/03/09 v3.09}
+\def\scrlfileversion{2012/06/15 v3.12}
 \ProvidesPackage{scrlfile}[%
   \scrlfileversion\space KOMA-Script package (loading files)]
 \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
@@ -207,18 +207,22 @@
 \newcommand*{\scrlfile@excludedpackages}{}
 \let\scrlfile@excludedpackages\@empty
 \newcommand*{\scrlfile@saved@RequirePackage}{}
-\newcommand*{\PreventPackageFromLoading}[1]{%
-  \edef\reserved@b{#1}%
+\newcommand*{\PreventPackageFromLoading}{%
+  \@ifstar{\@PreventPackageFromLoading\PackageInfo}%
+          {\@PreventPackageFromLoading\PackageWarning}%
+}
+\newcommand*{\@PreventPackageFromLoading}[2]{%
+  \edef\reserved@b{#2}%
   \ifx \reserved@b\@empty
-    \PackageWarning{scrlfile}{%
-      \string\PreventPackageFromLoading\space with empty argument\MesageBreak
+    #1{scrlfile}{%
+      \string\PreventPackageFromLoading\space with empty argument\MessageBreak
       ignored%
     }%
   \else
     \ifx\scrlfile@excludedpackages\@empty
       \let\scrlfile@saved@RequirePackage\RequirePackage
       \let\RequirePackage\scrlfile@RequirePackage
-      \def\reserved@a#1{%
+      \def\reserved@a#2{%
         \@latex@error
         {\noexpand \usepackage before \string\documentclass}%
         {\noexpand \usepackage may only appear in the document
@@ -240,12 +244,13 @@
     \reserved@b\do {%
       \ifx\reserved@a\@empty\else
         \expandafter\@ifpackageloaded\expandafter{\reserved@a}{%
-          \PackageWarning{scrlfile}{%
+          #1{scrlfile}{%
             package `\reserved@a' already loaded.\MessageBreak
             Cannot prevent it from beeing loaded%
           }%
         }{%
-          \edef\scrlfile@excludedpackages{,\reserved@a}%
+          \edef\scrlfile@excludedpackages{\scrlfile@excludedpackages,%
+            \reserved@a}%
         }%
       \fi
     }%
-- 
cgit v1.2.3

