summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrextend.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/scrextend.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/scrextend.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty49
1 files changed, 44 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index f64d14dd229..1615b5dab2d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -30,7 +30,7 @@
%% scrklist.dtx (with options: `package,extend,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.
@@ -97,7 +97,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrextend.dtx
\ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
@@ -226,6 +226,7 @@
\@namedef{scr@v@3.08b}{10}
\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@3.09a}{10}
+\@namedef{scr@v@3.10}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -359,7 +360,7 @@
\fi
\ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
- \let\FN@mf@prepare\scr@mf@prepare
+ \def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
@@ -865,7 +866,7 @@
\raggeddictum\parbox{\dictumwidth}{%
{\@dictumfont{\raggeddictumtext #2\strut\par}%
\def\@tempa{#1}\ifx\@tempa\@empty\else%
- {\raggeddictumtext\vskip-1ex\hrulefill\par}%
+ {\raggeddictumtext\dictumrule}%
\raggeddictumauthor\@dictumauthorfont\dictumauthorformat{#1}%
\strut\par%
\fi%
@@ -873,6 +874,7 @@
}\par%
\endgroup
}
+\newcommand*{\dictumrule}{\vskip-1ex\hrulefill\par}%
\newcommand*{\dictumwidth}{.3333\textwidth}
\newcommand*{\raggeddictum}{\raggedleft}
\newcommand*{\dictumauthorformat}[1]{(#1)}
@@ -919,7 +921,7 @@
\DeclareRobustCommand*\textsubscript[1]{%
\@textsubscript{\selectfont#1}%
}
-\newcommand{\@textsubscript}[1]{%
+\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
%%% From File: scrkpage.dtx
@@ -1034,12 +1036,49 @@
\fi
\let\@footnotetext\scr@saved@footnotetext
}
+\BeforePackage{setspace}{%
+ \let\@footnotetext\scr@saved@footnotetext
+}
+\AfterPackage{setspace}{%
+ \let\scr@saved@footnotetext\@footnotetext
+ \renewcommand{\@footnotetext}[1]{%
+ \scr@saved@footnotetext{#1}%
+ \csname FN@mf@prepare\endcsname
+ }%
+}
\newcommand*{\multiplefootnoteseparator}{%
\begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup
}
\providecommand*{\multfootsep}{,}
\newcommand*{\multiplefootnotemarker}{3sp}
\providecommand*{\thefootnotemark}{\@thefnmark}
+\def\reserved@a{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
+\ifx\reserved@a\@makefnmark
+\deffootnotemark{\textsuperscript{\thefootnotemark}}
+\else
+ \IfFileExists{etoolbox.sty}{%
+ \PackageInfo{scrextend}{%
+ unexpected definition of `\string\@makefnmark'.\MessageBreak
+ Trying to patch it%
+ }%
+ \RequirePackage{etoolbox}%
+ \patchcmd{\@makefnmark}{\@thefnmark}{\thefootnotemark}{%
+ \PackageInfo{scrextend}{patch seems to be successfull}%
+ }{%
+ \PackageWarning{scrextend}{%
+ patching `\string\@makefnmark' failed.\MessageBreak
+ Using hard coded redefinition%
+ }%
+ \deffootnotemark{\textsuperscript{\thefootnotemark}}%
+ }%
+ }{%
+ \PackageWarning{scrextend}{%
+ unexpected definition of `\string\@makefnmark'.\MessageBreak
+ Using hard coded redefintion%
+ }%
+ \deffootnotemark{\textsuperscript{\thefootnotemark}}%
+ }%
+\fi
\providecommand*{\footref}[1]{%
\begingroup
\unrestored@protected@xdef\@thefnmark{\ref{#1}}%