summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
committerKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
commit4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch)
tree968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/tex/latex/koma-script/scrextend.sty
parent59d9a998c6236de39603cb2ea077c5371e06b842 (diff)
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 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.sty85
1 files changed, 53 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index ec03d9c0029..9409f23e397 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 @@
%% scrkernel-listsandtabulars.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -62,7 +62,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
\PackageWarning{scrextend}{%
@@ -74,7 +74,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -96,11 +96,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
-\ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
- (extend other classes with features of KOMA-Script classes)]
+%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
+\ProvidesPackage{scrextend}[%
+ 2014/10/28 v3.14 KOMA-Script
+ package (extend other classes with features of KOMA-Script classes)%
+]
\newcommand*{\scr@ext@activate}[1]{%
\scr@ifundefinedorrelax{scr@ext@activate@#1}{%
\@namedef{scr@ext@immediate@#1}{%
@@ -122,9 +124,9 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
\AtEndOfPackage{%
@@ -145,7 +147,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -159,7 +161,9 @@
Because of this, version was set to `first'%
}%
}{%
- \PackageInfoNoLine{scrextend}{%
+ \PackageInfoNoLine{%
+ scrextend%
+ }{%
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
@@ -228,8 +232,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -276,7 +283,7 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
\expandafter\newif\csname if@titlepage\endcsname
@@ -307,15 +314,15 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -332,7 +339,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -415,9 +435,9 @@
\ifhmode\spacefactor\@x@sf\fi
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
@@ -775,7 +795,7 @@
\fi
}%
}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -950,12 +970,14 @@
\let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
- \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \@makeextratitle
- \next@tdpage
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle
+ \next@tdpage
+ \fi
\@maketitle
\else
\ifx\@extratitle\@empty\else
@@ -964,7 +986,9 @@
\twocolumn[\@maketitle]%
\fi
\else
- \@makeextratitle
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle\next@tdpage
+ \fi
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
@@ -1001,13 +1025,11 @@
\global\let\and\relax
}%
\newcommand*{\@makeextratitle}{%
- \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tdpage
+ \noindent\@extratitle\par
\fi
}
\newcommand*{\@maketitle}{%
- \next@tdpage
\global\@topnum=\z@
\parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil
\ifx\@titlehead\@empty \else
@@ -1082,10 +1104,10 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
\@restonecolfalse
@@ -1153,8 +1175,7 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
-\newcommand*{\titlepagestyle}{plain}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%