diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrkbase.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrkbase.sty | 81 |
1 files changed, 46 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 0852a04ac5d..7dacb8ea32a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -12,7 +12,7 @@ %% scrkernel-fonts.dtx (with options: `package,body,scrkbase') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info] +%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $ +%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,14 +66,14 @@ \fi } \fi - \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}% + \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $ +%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2013/12/19 v3.12 KOMA-Script + 2014/10/28 v3.14 KOMA-Script package (% KOMA-Script-dependent basics and keyval usage)] @@ -88,9 +88,9 @@ %%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2013/12/19 v3.12 KOMA-Script + 2014/10/28 v3.14 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $ +%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $ \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% } @@ -121,25 +121,33 @@ \DeclareOption{#2}{\KOMA@UseDeprecatedOption{#1}{#2}{#3}}% } \newcommand*{\KOMA@UseDeprecatedOption}[3]{% - \let\scr@sr@co\CurrentOption \begingroup - #1{% - You've used obsolete option `#2'.\MessageBreak - Usage of this option indicates an old document and\MessageBreak - \scr@ifundefinedorrelax{KV@KOMA.\@currname.\@currext @version}{% - changes compatibility level using\MessageBreak - `#3,version=first'.\MessageBreak - If you don't want this, y% - }{% - is deprecated.\MessageBreak - Y% + \scr@ifundefinedorrelax{KV@KOMA.\@currname.\@currext @version}{% + \edef\reserved@a{\noexpand\endgroup + \noexpand#1{% + You've used obsolete option `#2'.\noexpand\MessageBreak + Usage of this option is deprecated.\noexpand\MessageBreak + You should simply replace `#2'\noexpand\MessageBreak + by `#3'% + }% + \noexpand\KOMAExecuteOptions{#3}% + \noexpand\def\noexpand\CurrentOption{\CurrentOption}% + }% + }{% + \edef\reserved@a{\noexpand\endgroup + \noexpand#1{% + You've used obsolete option `#2'.\noexpand\MessageBreak + Usage of this option indicates an old document\noexpand\MessageBreak + and changes compatibility level using\noexpand\MessageBreak + `#3,version=first'.\noexpand\MessageBreak + If you don't want this, you should simply\noexpand\MessageBreak + replace option `#2' by `#3'% + }% + \noexpand\KOMAExecuteOptions{#3,version=first}% + \noexpand\def\noexpand\CurrentOption{\CurrentOption}% }% - ou should simply replace\MessageBreak - usage of option `#2' by `#3'% }% - \endgroup - \KOMAExecuteOptions{#3,version=first}% - \let\CurrentOption\scr@sr@co + \reserved@a } \newcommand*{\KOMA@DeclareStandardOption}{% \@ifnextchar [%] @@ -153,19 +161,22 @@ \DeclareOption{#2}{\KOMA@UseStandardOption{#1}{#2}{#3}}% } \newcommand*{\KOMA@UseStandardOption}[3]{% - \let\scr@sr@co\CurrentOption - #1{% - You've used standard option `#2'.\MessageBreak - This is correct!\MessageBreak - Internally I'm using `#3'.\MessageBreak - If you'd like to set the option with \string\KOMAoptions,\MessageBreak - you'd have to use `#3' there\MessageBreak - instead of `#2', too% - }% - \KOMAExecuteOptions{#3}% - \let\CurrentOption\scr@sr@co + \begingroup + \edef\reserved@a{\noexpand\endgroup + \noexpand#1{% + You've used standard option `#2'.\noexpand\MessageBreak + This is correct!\noexpand\MessageBreak + Internally I'm using `#3'.\noexpand\MessageBreak + If you'd like to set the option with \string\KOMAoptions,% + \noexpand\MessageBreak + you'd have to use `#3' there\noexpand\MessageBreak + instead of `#2', too% + }% + \noexpand\KOMAExecuteOptions{#3}% + \noexpand\def\noexpand\CurrentOption{\CurrentOption}% + }% + \reserved@a } -\newcommand*{\scr@sr@co}{} \newcommand*{\KOMA@newdeprecatedcommand}[3][\@gobbletwo]{% \newcommand*{#2}{\KOMA@UseDeprecatedCommand{#1}{\string#2}{#3}}% } |