From 0a00b3b492fd27dc12cddae602b2c43206a17d74 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Fri, 24 Apr 2015 23:19:31 +0000
Subject: koma-script (24apr15)

git-svn-id: svn://tug.org/texlive/trunk@37036 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/koma-script/scrhack.sty   | 40 +++++++++++++++-------
 1 file changed, 27 insertions(+), 13 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 6d485f32da8..b2a4a5df1c1 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 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -65,28 +65,34 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
 \endgroup
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+  \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
 %%% using: package,identify
 \ProvidesPackage{scrhack}[%
-  2015/02/07 v3.16 KOMA-Script
+  2015/04/23 v3.17 KOMA-Script
   package
 ]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
 %%% using: package,option
 \KOMA@ifkey{hyperref}{@scrhack@hyperref}%
-\@scrhack@hyperreftrue
+\KOMAExecuteOptions{hyperref=true}%
 \KOMA@ifkey{float}{@scrhack@float}%
-\@scrhack@floattrue
-\KOMA@ifkey{floatrow}{@scrhack@floatrow}%
-\@scrhack@floatrowtrue
-\KOMA@ifkey{listings}{@scrhack@listings}%
-\@scrhack@listingstrue
+\KOMAExecuteOptions{float=true}%
+\KOMA@ifkey{floatrow}{@scrhack@floatrow}
+\KOMAExecuteOptions{floatrow=true}
+\KOMA@ifkey{listings}{@scrhack@listings}
+\KOMAExecuteOptions{listings=true}
+\KOMA@ifkey{setspace}{@scrhack@setspace}
+\KOMAExecuteOptions{setspace=true}
 \KOMAProcessOptions\relax
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
 %%% using: package,body
 \newcommand{\scr@ifexpected}[2]{%
   \begingroup
@@ -120,6 +126,7 @@
     \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}{%
@@ -151,6 +158,13 @@
   }%
   \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi
 }
+\AfterPackage*{setspace}{%
+  \KOMA@key[.scrhack.sty]{setspace}{%
+    \PackageWarning{scrhack}{option `setspace' ignored}%
+    \FamilyKeyStateProcessed
+  }%
+  \if@scrhack@setspace\scr@hack@load\@pkgextension{setspace}\fi
+}
 %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
 \@ifundefined{KOMAScript}{%
   \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
-- 
cgit v1.2.3

