summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-03-07 00:36:15 +0000
committerKarl Berry <karl@freefriends.org>2012-03-07 00:36:15 +0000
commit3c83ff430f9038fe824468a3a6df3cd66cff0016 (patch)
treeecb739f4be1b4e22130fd6c816d320643c3b9110 /Master/texmf-dist/tex/latex/koma-script/scrhack.sty
parent742ee4652adc1208821c470a0fb7cb97fbe82905 (diff)
koma-script (6mar12)
git-svn-id: svn://tug.org/texlive/trunk@25573 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.sty12
1 files changed, 10 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 6a9a78d8f8e..526a13293d3 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-2011
+%% Copyright (c) 1994-2012
%% 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{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrhack.dtx
%%% using: package,identify
@@ -81,6 +81,8 @@
\@scrhack@hyperreftrue
\KOMA@ifkey{float}{@scrhack@float}%
\@scrhack@floattrue
+\KOMA@ifkey{floatrow}{@scrhack@floatrow}%
+\@scrhack@floatrowtrue
\KOMA@ifkey{listings}{@scrhack@listings}%
\@scrhack@listingstrue
\KOMAProcessOptions\relax
@@ -133,6 +135,12 @@
}%
\if@scrhack@float\scr@hack@load\@pkgextension{float}\fi
}
+\AfterPackage*{floatrow}{%
+ \KOMA@key[.scrhack.sty]{floatrow}{%
+ \PackageWarning{scrhack}{option `floatrow' ignored}%
+ }%
+ \if@scrhack@floatrow\scr@hack@load\@pkgextension{floatrow}\fi
+}
\AfterPackage*{listings}{%
\KOMA@key[.scrhack.sty]{listings}{%
\PackageWarning{scrhack}{option `listings' ignored}%