From 28c9b4ce4d428d1582c35205f79c62da999cf4d0 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 2 Jul 2015 22:11:36 +0000
Subject: koma-script (2jul15)

git-svn-id: svn://tug.org/texlive/trunk@37734 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/koma-script/scrhack.sty   | 44 +++++++++++++---------
 1 file changed, 27 insertions(+), 17 deletions(-)

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

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 44d734039fc..bcff62f8862 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -43,7 +43,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 2089 2015-05-06 06:10:29Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -65,21 +65,21 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}%
 \endgroup
 \providecommand*{\scr@pkgextension}{\@pkgextension}
 \AtBeginDocument{%
   \let\scr@pkgextension\@pkgextension
 }
-%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
+%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $
 %%% using: package,identify
 \ProvidesPackage{scrhack}[%
-  2015/05/06 v3.17a KOMA-Script
+  2015/07/02 v3.18 KOMA-Script
   package
 ]
-%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
+%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $
 %%% using: package,option
 \KOMA@ifkey{hyperref}{@scrhack@hyperref}%
 \KOMAExecuteOptions{hyperref=true}%
@@ -92,7 +92,7 @@
 \KOMA@ifkey{setspace}{@scrhack@setspace}
 \KOMAExecuteOptions{setspace=true}
 \KOMAProcessOptions\relax
-%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
+%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $
 %%% using: package,body
 \newcommand{\scr@ifexpected}[2]{%
   \begingroup
@@ -121,21 +121,31 @@
     \PackageInfo{scrhack}{ignorring #2 hack}%
   }%
 }
-\AfterPackage*{hyperref}{%
-  \@ifpackagelater{hyperref}{2009/11/24}{%
+\BeforePackage{hyperref}{%
+  \scr@ifundefinedorrelax{hy@insteadofrefstepcounter}{}{%
     \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
-      detection of hyperref version, that doesn't\MessageBreak
+      detection of KOMA-Script class, that doesn't\MessageBreak
       need that hack,}%
     \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}%
-  }{%
-    \AtEndOfPackage{%
-      \KOMA@key[.scrhack.sty]{hyperref}{%
-        \PackageWarning{scrhack}{option `hyperref=#1' ignored}%
-        \FamilyKeyStateProcessed
+  }%
+}
+\AfterPackage*{hyperref}{%
+  \if@scrhack@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,}%
+      \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}%
+    }{%
+      \AtEndOfPackage{%
+        \KOMA@key[.scrhack.sty]{hyperref}{%
+          \PackageWarning{scrhack}{option `hyperref=#1' ignored}%
+          \FamilyKeyStateProcessed
+        }%
+        \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi
       }%
-      \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi
     }%
-  }%
+  \fi
 }
 \AfterPackage*{float}{%
   \KOMA@key[.scrhack.sty]{float}{%
-- 
cgit v1.2.3

