diff options
author | Karl Berry <karl@freefriends.org> | 2010-02-17 01:13:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-02-17 01:13:08 +0000 |
commit | fc452419467f73cbbe9e7748ac266442487b75c4 (patch) | |
tree | 9f2cc4858705479715feb886723ffd6361cbfc29 /Master/texmf-dist/tex/latex/koma-script/scrhack.sty | |
parent | 5323eaeeb7b140b77a69f88dba6a5ef38f12f60e (diff) |
koma-script update (16feb10)
git-svn-id: svn://tug.org/texlive/trunk@17067 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrhack.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrhack.sty | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index d10ec1b27fb..126b5d382c4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -11,7 +11,7 @@ %% scrhack.dtx (with options: `package,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2009 +%% Copyright (c) 1994-2010 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% + \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}% \endgroup %%% From File: scrhack.dtx %%% using: package,identify @@ -79,28 +79,10 @@ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \@scrhack@hyperreftrue -\AtBeginDocument{% - \KOMA@key[.scrhack.sty]{hyperref}{% - \PackageWarning{scrhack}{option `hyperref=#1' ignored}% - }% - \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi -} \KOMA@ifkey{float}{@scrhack@float}% \@scrhack@floattrue -\AfterPackage*{float}{% - \KOMA@key[.scrhack.sty]{float}{% - \PackageWarning{scrhack}{option `float' ignored}% - }% - \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi -} \KOMA@ifkey{listings}{@scrhack@listings}% \@scrhack@listingstrue -\AfterPackage*{listings}{% - \KOMA@key[.scrhack.sty]{listings}{% - \PackageWarning{scrhack}{option `listings' ignored}% - }% - \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi -} \KOMAProcessOptions\relax %%% From File: scrhack.dtx %%% using: package,body @@ -121,9 +103,41 @@ \else \expandafter\@firstoftwo \fi - {\PackageInfo{scrhack}{loading #2 hack}% - \makeatletter\input{#2.hak}\makeatother}% - {\PackageInfo{scrhack}{ignorring #2 hack}}% + {% + \PackageInfo{scrhack}{loading #2 hack}% + \edef\reserved@a{% + \noexpand\makeatletter\noexpand\input{#2.hak}% + \noexpand\catcode`\noexpand\@\the\catcode`\@\relax + }\reserved@a + }{% + \PackageInfo{scrhack}{ignorring #2 hack}% + }% +} +\AfterPackage*{hyperref}{% + \@ifpackagelater{hyperref}{2009/11/24}{% + \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak + detection of hyperref version, that doesn't\MessageBreak + need that hack,}% + }{% + \AtEndOfPackage{% + \KOMA@key[.scrhack.sty]{hyperref}{% + \PackageWarning{scrhack}{option `hyperref=#1' ignored}% + }% + \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi + }% + }% +} +\AfterPackage*{float}{% + \KOMA@key[.scrhack.sty]{float}{% + \PackageWarning{scrhack}{option `float' ignored}% + }% + \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi +} +\AfterPackage*{listings}{% + \KOMA@key[.scrhack.sty]{listings}{% + \PackageWarning{scrhack}{option `listings' ignored}% + }% + \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi } %%% From File: scrlogo.dtx \@ifundefined{KOMAScript}{% |