summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrlfile.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrlfile.dtx43
1 files changed, 31 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx
index b7c2ba8f256..01f99fd20b0 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{593}
+% \CheckSum{599}
% \iffalse meta-comment
% ======================================================================
% scrlfile.dtx
@@ -64,7 +64,7 @@
%%% From File: scrlfile.dtx
%<*driver|scrlfile|load>
% \fi
-\def\scrlfileversion{2011/03/09 v3.09}
+\def\scrlfileversion{2012/06/15 v3.12}
% \iffalse
%</driver|scrlfile|load>
%<*driver>
@@ -369,6 +369,7 @@
% \cs{RequirePackage} before loading the class.
%
% \DescribeMacro{\PreventPackageFromLoading}
+% \DescribeMacro{\PreventPackageFromLoading*}
% \DescribeMacro{\ResetPreventPackageFromLoading}
% \DescribeMacro{\StorePreventPackageFromLoading}
% The command \cs{PreventPackageFromLoading}\marg{package list}
@@ -382,6 +383,11 @@
% use \cs{StorePackageFromLoading}\marg{command} to store the current list at
% macro \meta{command}.
%
+% The normal version of \cs{PreventPackageFromLoading} with empty argument
+% results in a warning message. The star version
+% \cs{PreventPackageFromLoading*} writes only an info into the log-file, if
+% the argument is empty. Both commands are not robust!
+%
% \DescribeMacro{\BeforeClosingMainAux}
% The command \cs{BeforeClosingMainAux}\marg{instructions}
% works different from all the commands above. Is isn't a
@@ -780,23 +786,32 @@
% \end{macro}
%
% \begin{macro}{\PreventPackageFromLoading}
-% \changes{v3.08}{2010/11/04}{New}
+% \changes{v3.08}{2010/11/04}{New}
+% \changes{v3.11a}{2012/06/13}{write fault error in \cs{MessageBreak} fixed}
+% \changes{v3.12}{2012/06/15}{new star version allowes empty argument with
+% info instead of warning}
+% \begin{macro}{\@PreventPackageFromLoading}
+% \changes{v3.12}{2012/06/15}{New (internal)}
% \begin{macro}{\scrlfile@excludedpackages}
-% \changes{v3.08}{2010/11/04}{New (internal)}
+% \changes{v3.08}{2010/11/04}{New (internal)}
% \begin{macro}{\scrlfile@saved@RequirePackage}
-% \changes{v3.08}{2010/11/04}{New (internal)}
+% \changes{v3.08}{2010/11/04}{New (internal)}
% \begin{macrocode}
\newcommand*{\scrlfile@excludedpackages}{}
\let\scrlfile@excludedpackages\@empty
\newcommand*{\scrlfile@saved@RequirePackage}{}
-\newcommand*{\PreventPackageFromLoading}[1]{%
+\newcommand*{\PreventPackageFromLoading}{%
+ \@ifstar{\@PreventPackageFromLoading\PackageInfo}%
+ {\@PreventPackageFromLoading\PackageWarning}%
+}
+\newcommand*{\@PreventPackageFromLoading}[2]{%
% \end{macrocode}
% We do nothing, if the argument was empty:
% \begin{macrocode}
- \edef\reserved@b{#1}%
+ \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
@@ -807,7 +822,7 @@
\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
@@ -829,17 +844,20 @@
% We have to test, if a package was already loaded. Only not yet loaded
% packages will be added to the exclusion list. Empty arguments will be
% ignored.
+% \changes{v3.11a}{2012/06/11}{missing \cs{scrlfile@excludepackages} at
+% redefinition of \cs{scrlfile@excludepackages} added}
% \begin{macrocode}
\expandafter\@for \expandafter\reserved@a\expandafter:\expandafter=%
\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
}%
@@ -912,6 +930,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\scr@gobbleopt}
% \changes{v3.08}{2010/11/04}{New (internal)}