diff options
author | Karl Berry <karl@freefriends.org> | 2013-12-26 23:18:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-12-26 23:18:36 +0000 |
commit | 9b219d1b664067729034647a4b37626cf2bf5e26 (patch) | |
tree | 00708467b44f90736dc32ed1bebb95e9c4710139 /Master/texmf-dist/tex/latex/koma-script/scrextend.sty | |
parent | c00c8298eb6913b74270a36c1f1018f1e9946f7b (diff) |
koma-script (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32489 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.sty | 620 |
1 files changed, 429 insertions, 191 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index b4be678a478..ec03d9c0029 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -1,37 +1,36 @@ %% %% This is file `scrextend.sty', -%% generated with the docstrip utility. +%% generated with the docstrip utility, extended by scrdocstrip. %% %% The original source files were: %% %% scrextend.dtx (with options: `package,extend,preidentify') -%% scrkvers.dtx (with options: `package,extend') +%% scrkernel-version.dtx (with options: `package,extend') %% scrextend.dtx (with options: `package,extend,identify,prepare') -%% scrkbase.dtx (with options: `load') +%% scrkernel-basics.dtx (with options: `load') %% scrextend.dtx (with options: `package,extend,option') -%% scrkcomp.dtx (with options: `package,extend,option') -%% scrkmisc.dtx (with options: `package,extend,option') -%% scrkfont.dtx (with options: `package,extend,option') -%% scrktitl.dtx (with options: `package,extend,option') -%% scrksect.dtx (with options: `package,extend,option') -%% scrkpage.dtx (with options: `package,extend,option') -%% scrkfloa.dtx (with options: `package,extend,option') -%% scrkftn.dtx (with options: `package,extend,option') -%% scrklist.dtx (with options: `package,extend,option') -%% scrkmisc.dtx (with options: `package,extend,execoption') -%% scrkcomp.dtx (with options: `package,extend,body') -%% scrkfont.dtx (with options: `package,extend,body') -%% scrktitl.dtx (with options: `package,extend,body') -%% scrksect.dtx (with options: `package,extend,body') -%% scrkmisc.dtx (with options: `package,extend,body') -%% scrkpage.dtx (with options: `package,extend,body') -%% scrkfloa.dtx (with options: `package,extend,body') -%% scrkftn.dtx (with options: `package,extend,body') -%% scrklist.dtx (with options: `package,extend,body') +%% scrkernel-compatibility.dtx (with options: `package,extend,option') +%% scrkernel-miscellaneous.dtx (with options: `package,extend,option') +%% scrkernel-fonts.dtx (with options: `package,extend,option') +%% scrkernel-title.dtx (with options: `package,extend,option') +%% scrkernel-sections.dtx (with options: `package,extend,option') +%% scrkernel-pagestyles.dtx (with options: `package,extend,option') +%% scrkernel-floats.dtx (with options: `package,extend,option') +%% scrkernel-footnotes.dtx (with options: `package,extend,option') +%% scrkernel-listsandtabulars.dtx (with options: `package,extend,option') +%% scrkernel-miscellaneous.dtx (with options: `package,extend,execoption') +%% scrkernel-compatibility.dtx (with options: `package,extend,body') +%% scrkernel-fonts.dtx (with options: `package,extend,body') +%% scrkernel-title.dtx (with options: `package,extend,body') +%% scrkernel-sections.dtx (with options: `package,extend,body') +%% scrkernel-miscellaneous.dtx (with options: `package,extend,body') +%% scrkernel-pagestyles.dtx (with options: `package,extend,body') +%% scrkernel-floats.dtx (with options: `package,extend,body') +%% scrkernel-footnotes.dtx (with options: `package,extend,body') +%% scrkernel-listsandtabulars.dtx (with options: `package,extend,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2012 -%% Markus Kohm and any individual authors listed elsewhere in this file. +%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -63,7 +62,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: scrextend.dtx +%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname KOMAClassName\endcsname\relax\else \PackageWarning{scrextend}{% @@ -75,9 +74,9 @@ }% \expandafter\endinput \fi -%%% From File: scrkvers.dtx +%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $ \begingroup - \makeatletter + \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined \newcommand*{\@CheckKOMAScriptVersion}[1]{% \gdef\KOMAScriptVersion{#1}% @@ -97,9 +96,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}% + \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}% \endgroup -%%% From File: scrextend.dtx +%%% 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)] \newcommand*{\scr@ext@activate}[1]{% @@ -123,9 +122,9 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: scrkbase.dtx +%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: scrextend.dtx +%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $ \KOMA@key{extendedfeature}{% \scr@ext@activate{#1}% \AtEndOfPackage{% @@ -143,16 +142,10 @@ } \AtEndOfPackage{% \KOMA@key{extendedfeature}{% - \PackageError{scrextend}{% - Option `extendedfeature' too late% - }{% - Option `extendedfeature' my be used only while loading the - package.\MessageBreak - But you've tried to set it up later% - }% + \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: scrkcomp.dtx +%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $ \providecommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -170,6 +163,7 @@ Switching compatibility level to `#1'% }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + \FamilyKeyStateProcessed }% } \AtEndOfPackage{% @@ -183,6 +177,7 @@ package.\MessageBreak But you've tried to set it up later.% }% + \FamilyKeyStateProcessed }% } \@namedef{scr@v@first}{0} @@ -232,20 +227,23 @@ \@namedef{scr@v@3.11}{10} \@namedef{scr@v@3.11a}{10} \@namedef{scr@v@3.11b}{10} -\@namedef{scr@v@last}{10} -%%% From File: scrkmisc.dtx +\@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 $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% - \if@tempswa - \setlength{\overfullrule}{5pt}% - \else - \setlength{\overfullrule}{\z@}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@tempswa + \setlength{\overfullrule}{5pt}% + \else + \setlength{\overfullrule}{\z@}% + \fi \fi } \KOMA@DeclareStandardOption [scrextend] {final}{draft=false} -%%% From File: scrkfont.dtx +%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $ \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% \expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil @@ -276,14 +274,31 @@ }{% \@tempa }% + \FamilyKeyStateProcessed } -%%% From File: scrktitl.dtx +%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $ \scr@ext@activateable{title}{% \scr@ifundefinedorrelax{if@titlepage}{% \expandafter\newif\csname if@titlepage\endcsname \@titlepagefalse - }{} -\KOMA@ifkey{titlepage}{@titlepage}% + }{}% + \scr@ifundefinedorrelax{if@titlepageiscoverpage}{% + \expandafter\newif\csname if@titlepageiscoverpage\endcsname + \@titlepageiscoverpagefalse + }{}% +\KOMA@key{titlepage}[true]{% + \ifstr{##1}{firstiscover}{% + \@titlepagetrue + \@titlepageiscoverpagetrue + \FamilyKeyStateProcessed + }{% + \def\FamilyElseValue{, `firstiscover'}% + \KOMA@set@ifkey{titlepage}{@titlepage}{##1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \@titlepageiscoverpagefalse + \fi + }% +} \def\scr@ext@immediate@title{% \scr@ext@activate{title}% \let\scr@ext@immediate@title\relax @@ -292,8 +307,9 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: scrksect.dtx -%%% From File: scrkpage.dtx +%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $ +\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} +%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $ \KOMA@key{cleardoublepage}{% \begingroup% \def\@tempc{% @@ -306,6 +322,7 @@ \def\cleardoublepage{\cleardoublestandardpage}% \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% + \FamilyKeyStateProcessed }% }{% \ifnotundefined{ps@#1}{% @@ -313,6 +330,7 @@ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% + \FamilyKeyStateProcessed }% }{}% }% @@ -348,8 +366,8 @@ {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -%%% From File: scrkfloa.dtx -%%% From File: scrkftn.dtx +%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $ +%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -367,11 +385,13 @@ \let\@footnotemark\scr@footnotemark \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% + \FamilyKeyStateProcessed }{% \ifstr{#1}{nomultiple}{% \let\@footnotemark\scr@saved@footnotemark \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty + \FamilyKeyStateProcessed }{% \KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}% }% @@ -394,11 +414,46 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: scrklist.dtx -%%% From File: scrkmisc.dtx +%%% 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 $ \KOMAProcessOptions\relax -%%% From File: scrkcomp.dtx -%%% From File: scrkfont.dtx +%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $ +%%% 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 + \setlength{#1}{#2 \@plus#3 \@minus#4}% + \else + \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi + \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{\p@ \@plus\p@ \@minus\p@}% + \else + \setlength{#1}{\p@ \@plus\p@ \@minus#4}% + \fi + \else + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{\p@ \@plus#3 \@minus\p@}% + \else + \setlength{#1}{\p@ \@plus#3 \@minus#4}% + \fi + \fi + \else + \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{#2 \@plus\p@ \@minus\p@}% + \else + \setlength{#1}{#2 \@plus\p@ \@minus#4}% + \fi + \else + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{#2 \@plus#3 \@minus\p@}% + \else + \setlength{#1}{#2 \@plus#3 \@minus#4}% + \fi + \fi + \fi + \fi +} \newcommand*{\changefontsizes}[2][1.2\@tempdima]{% \PackageWarning{scrextend}{% Using fallback calculation to setup font sizes\MessageBreak @@ -422,12 +477,20 @@ \setlength{\@tempdimc}{\@tempdima}% \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}% \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \else + \scr@setlength{\abovedisplayskip}% + {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}% + \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}% + \scr@setlength{\belowdisplayshortskip}% + {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}% + \fi \setlength{\belowdisplayskip}{\abovedisplayskip}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% \edef\normalsize{% \noexpand\@setfontsize\noexpand\normalsize {\the\@tempdima}{\the\@tempdimb}% @@ -439,12 +502,20 @@ }% \setlength{\@tempdima}{0.9125\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \else + \scr@setlength{\abovedisplayskip}% + {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}% + \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}% + \scr@setlength{\belowdisplayshortskip}% + {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}% + \fi \setlength{\belowdisplayskip}{\abovedisplayskip}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% \edef\small{% \noexpand\@setfontsize\noexpand\small {\the\@tempdima}{\the\@tempdimb}% @@ -456,12 +527,20 @@ }% \setlength{\@tempdima}{.83334\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \else + \scr@setlength{\abovedisplayskip}% + {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}% + \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}% + \scr@setlength{\belowdisplayshortskip}% + {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}% + \fi \setlength{\belowdisplayskip}{\abovedisplayskip}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% \edef\footnotesize{% \noexpand\@setfontsize\noexpand\footnotesize {\the\@tempdima}{\the\@tempdimb}% @@ -514,29 +593,37 @@ {\the\@tempdima}{\the\@tempdimb}% }% \normalsize - \setlength{\footnotesep}{.7\@tempdimc}% - \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus - .6\@tempdimc}% - \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\dbltextfloatsep}{\textfloatsep}% - \setlength{\@fptop}{0\p@ \@plus 1fil}% - \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% - \setlength{\@fpbot}{\@fptop}% - \setlength{\@dblfptop}{0\p@ \@plus 1fil}% - \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% - \setlength{\@dblfpbot}{\@fptop}% - \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus - .16667\@tempdimc}% - \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus - .5\@tempdimc}% - \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\footnotesep}{.7\@tempdimc}% + \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus + .6\@tempdimc}% + \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dbltextfloatsep}{\textfloatsep}% + \setlength{\@fptop}{0\p@ \@plus 1fil}% + \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@fpbot}{\@fptop}% + \setlength{\@dblfptop}{0\p@ \@plus 1fil}% + \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@dblfpbot}{\@fptop}% + \fi + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus + .5\@tempdimc}% + \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \else + \setlength{\@tempdimb}{\f@baselineskip}% + \scr@setlength{\parsep}% + {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}% + \scr@setlength{\topsep}% + {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}% + \fi \@tempswafalse \begingroup \def\@list@extra{\aftergroup\@tempswatrue}% @@ -549,9 +636,16 @@ \if@tempswa\noexpand\@list@extra\fi }% \let\@listI\@listi - \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus - .41667\@tempdimc}% - \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus + .41667\@tempdimc}% + \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \else + \scr@setlength{\parsep}% + {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}% + \scr@setlength{\topsep}% + {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}% + \fi \@tempswafalse \begingroup \def\@list@extra{\aftergroup\@tempswatrue}% @@ -563,9 +657,16 @@ \itemsep \parsep \if@tempswa\noexpand\@list@extra\fi }% - \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus - .16667\@tempdimc}% - \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \else + \scr@setlength{\parsep}% + {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}% + \scr@setlength{\topsep}% + {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}% + \fi \@tempswafalse \begingroup \def\@list@extra{\aftergroup\@tempswatrue}% @@ -577,8 +678,15 @@ \itemsep \parsep \if@tempswa\noexpand\@list@extra\fi }% - \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% - \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \else + \scr@setlength{\parsep}% + {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}% + \scr@setlength{\topsep}% + {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}% + \fi \@tempswafalse \begingroup \def\@list@extra{\aftergroup\@tempswatrue}% @@ -591,8 +699,13 @@ \itemsep \parsep \if@tempswa\noexpand\@list@extra\fi }% - \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% - \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \else + \scr@setlength{\topsep}% + {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}% + \fi + \setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}% \@tempswafalse \begingroup \def\@list@extra{\aftergroup\@tempswatrue}% @@ -602,7 +715,7 @@ \labelwidth=\dimexpr \leftmargin-\labelsep \topsep \the\topsep \parsep \z@ - \partopsep \the\parsep + \partopsep \the\partopsep \itemsep \topsep \if@tempswa\noexpand\@list@extra\fi }% @@ -612,7 +725,7 @@ \csname @listiv\endcsname \endgroup \edef\@listiv{\leftmargin\leftmarginiv - \labelwidth=\dimexpr \leftmargin-\labelsep + \labelwidth=\dimexpr \leftmargin-\labelsep\relax \if@tempswa\noexpand\@list@extra\fi }% \@tempswafalse @@ -621,7 +734,7 @@ \csname @listv\endcsname \endgroup \edef\@listv{\leftmargin\leftmarginv - \labelwidth=\dimexpr \leftmargin-\labelsep + \labelwidth=\dimexpr \leftmargin-\labelsep\relax \if@tempswa\noexpand\@list@extra\fi }% \@tempswafalse @@ -630,18 +743,39 @@ \csname @listvi\endcsname \endgroup \edef\@listvi{\leftmargin\leftmarginvi - \labelwidth=\dimexpr \leftmargin-\labelsep + \labelwidth=\dimexpr \leftmargin-\labelsep\relax \if@tempswa\noexpand\@list@extra\fi }% \@listi - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}% - \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}% - \setlength\dblfloatsep\intextsep - \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}% + \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}% + \setlength\dblfloatsep\intextsep + \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}% + \else + \setlength{\@tempdimb}{\f@baselineskip}% + \setlength{\footnotesep}{.555\@tempdimb}% + \scr@setlength{\skip\footins}% + {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}% + \scr@setlength{\floatsep}% + {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}% + \scr@setlength{\textfloatsep}% + {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}% + \setlength{\intextsep}{\floatsep}% + \setlength{\dblfloatsep}{\floatsep}% + \setlength{\dbltextfloatsep}{\textfloatsep}% + \setlength{\@fptop}{\z@ \@plus 1fil}% + \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}% + \setlength{\@fpbot}{\@fptop}% + \setlength{\@dblfptop}{\@fptop}% + \setlength{\@dblfpsep}{\@fpsep}% + \setlength{\@dblfpbot}{\@fptop}% + \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}% + \fi }% } -%%% From File: scrktitl.dtx +%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $ \scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -675,14 +809,61 @@ \newcommand{\dedication}[1]{\gdef\@dedication{% ##1% }}% -\newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}% +\newcommand*{\next@tpage}{% + \@thanks\global\let\@thanks\@empty + \clearpage + \csname titlepage@restore\endcsname + \thispagestyle{empty}% + \let\footnote\thanks + \setcounter{footnote}{0}% +} +\newcommand*{\next@tdpage}{% + \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi +} \let\maketitle\relax\let\@maketitle\relax \newcommand*\maketitle[1][1]{% + \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax + \else + \def\and{% + \end{tabular}% + \hskip 1em \@plus.17fil% + \begin{tabular}[t]{c}% + }% + \fi \if@titlepage \begin{titlepage} \setcounter{page}{% ##1% }% + \if@titlepageiscoverpage + \edef\titlepage@restore{% + \noexpand\endgroup + \noexpand\global\noexpand\@colht\the\@colht + \noexpand\global\noexpand\@colroom\the\@colroom + \noexpand\global\vsize\the\vsize + \noexpand\global\noexpand\@titlepageiscoverpagefalse + \noexpand\let\noexpand\titlepage@restore\noexpand\relax + }% + \begingroup + \topmargin=\dimexpr \coverpagetopmargin-1in\relax + \oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax + \evensidemargin=\dimexpr \coverpageleftmargin-1in\relax + \textwidth=\dimexpr + \paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax + \textheight=\dimexpr + \paperheight-\coverpagetopmargin-\coverpagebottommargin\relax + \headheight=0pt + \headsep=0pt + \footskip=\baselineskip + \@colht=\textheight + \@colroom=\textheight + \vsize=\textheight + \columnwidth=\textwidth + \hsize=\columnwidth + \linewidth=\hsize + \else + \let\titlepage@restore\relax + \fi \let\footnotesize\small \let\footnoterule\relax \let\footnote\thanks @@ -690,53 +871,69 @@ \let\@oldmakefnmark\@makefnmark \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}% \ifx\@extratitle\@empty \else - \noindent\@extratitle\next@tpage\cleardoubleemptypage - \thispagestyle{empty}% + \noindent\@extratitle\next@tdpage \fi \parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil \ifx\@titlehead\@empty \else \begin{minipage}[t]{\textwidth}% - \@titlehead + \usekomafont{titlehead}{\@titlehead\par}% \end{minipage}\par \fi \null\vfill \begin{center} \ifx\@subject\@empty \else - {\subject@font \@subject \par}% + {\usekomafont{subject}{\@subject\par}}% \vskip 3em \fi - {\titlefont\huge \@title\par}% + {\usekomafont{title}{\huge \@title\par}}% \vskip 1em - {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}% + {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}% \vskip 2em - {\Large \lineskip 0.75em - \begin{tabular}[t]{c} - \@author - \end{tabular}\par + {% + \usekomafont{author}{% + \lineskip 0.75em + \begin{tabular}[t]{c} + \@author + \end{tabular}\par + }% }% \vskip 1.5em - {\Large \@date \par}% + {\usekomafont{date}{\@date \par}}% \vskip \z@ \@plus3fill - {\Large \@publishers \par}% + {\usekomafont{publishers}{\@publishers \par}}% \vskip 3em \end{center}\par - \@thanks + \@thanks\let\@thanks\@empty \vfill\null - \if@twoside\next@tpage - \begin{minipage}[t]{\textwidth} - \@uppertitleback - \end{minipage}\par - \vfill - \begin{minipage}[b]{\textwidth} - \@lowertitleback - \end{minipage} + \if@twoside + \@tempswatrue + \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax + \else + \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty + \@tempswafalse + \fi\fi + \fi + \if@tempswa + \next@tpage + \begin{minipage}[t]{\textwidth} + \@uppertitleback + \end{minipage}\par + \vfill + \begin{minipage}[b]{\textwidth} + \@lowertitleback + \end{minipage}\par + \@thanks\let\@thanks\@empty + \fi \fi - \ifx\@dedication\@empty \else - \next@tpage\null\vfill - {\centering \Large \@dedication \par}% + \ifx\@dedication\@empty + \else + \next@tdpage\null\vfill + {\centering\usekomafont{dedication}{\@dedication \par}}% \vskip \z@ \@plus3fill - \if@twoside \next@tpage\cleardoubleemptypage \fi + \@thanks\let\@thanks\@empty + \cleardoubleemptypage \fi + \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi \end{titlepage} \else \par @@ -750,92 +947,115 @@ }% \fi \begingroup + \let\titlepage@restore\relax \renewcommand*\thefootnote{\@fnsymbol\c@footnote}% \let\@oldmakefnmark\@makefnmark \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark} + \next@tdpage \if@twocolumn \ifnum \col@number=\@ne + \@makeextratitle + \next@tdpage \@maketitle \else + \ifx\@extratitle\@empty\else + \twocolumn[\@makeextratitle]\next@tdpage + \fi \twocolumn[\@maketitle]% \fi \else - \newpage - \global\@topnum\z@ + \@makeextratitle \@maketitle \fi \thispagestyle{\titlepagestyle}\@thanks \endgroup \fi \setcounter{footnote}{0}% - \let\thanks\relax - \let\maketitle\relax - \let\@maketitle\relax - \global\let\@thanks\@empty - \global\let\@author\@empty - \global\let\@date\@empty - \global\let\@title\@empty - \global\let\@subtitle\@empty - \global\let\@extratitle\@empty - \global\let\@titlehead\@empty - \global\let\@subject\@empty - \global\let\@publishers\@empty - \global\let\@uppertitleback\@empty - \global\let\@lowertitleback\@empty - \global\let\@dedication\@empty - \global\let\author\relax - \global\let\title\relax - \global\let\extratitle\relax - \global\let\titlehead\relax - \global\let\subject\relax - \global\let\publishers\relax - \global\let\uppertitleback\relax - \global\let\lowertitleback\relax - \global\let\dedication\relax - \global\let\date\relax + \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax + \let\thanks\relax + \let\maketitle\relax + \let\@maketitle\relax + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\@subtitle\@empty + \global\let\@extratitle\@empty + \global\let\@titlehead\@empty + \global\let\@subject\@empty + \global\let\@publishers\@empty + \global\let\@uppertitleback\@empty + \global\let\@lowertitleback\@empty + \global\let\@dedication\@empty + \global\let\author\relax + \global\let\title\relax + \global\let\extratitle\relax + \global\let\titlehead\relax + \global\let\subject\relax + \global\let\publishers\relax + \global\let\uppertitleback\relax + \global\let\lowertitleback\relax + \global\let\dedication\relax + \global\let\date\relax + \fi \global\let\and\relax }% -\newcommand*{\@maketitle}{% - \clearpage - \let\footnote\thanks +\newcommand*{\@makeextratitle}{% + \next@tdpage \ifx\@extratitle\@empty \else - \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi + \noindent\@extratitle \next@tdpage \fi +} +\newcommand*{\@maketitle}{% + \next@tdpage + \global\@topnum=\z@ \parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil \ifx\@titlehead\@empty \else \begin{minipage}[t]{\textwidth} - \@titlehead + \usekomafont{titlehead}{\@titlehead\par}% \end{minipage}\par \fi \null \vskip 2em% \begin{center}% \ifx\@subject\@empty \else - {\subject@font \@subject \par} + {\usekomafont{subject}{\@subject \par}}% \vskip 1.5em \fi - {\titlefont\huge \@title \par}% + {\usekomafont{title}{\huge \@title \par}}% \vskip .5em {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}% \vskip 1em - {\Large - \lineskip .5em% - \begin{tabular}[t]{c} - \@author - \end{tabular}\par + {% + \usekomafont{author}{% + \lineskip .5em% + \begin{tabular}[t]{c} + \@author + \end{tabular}\par + }% }% \vskip 1em% - {\Large \@date \par}% + {\usekomafont{date}{\@date \par}}% \vskip \z@ \@plus 1em - {\Large \@publishers \par} + {\usekomafont{publishers}{\@publishers \par}}% \ifx\@dedication\@empty \else \vskip 2em - {\Large \@dedication \par} + {\usekomafont{dedication}{\@dedication \par}}% \fi \end{center}% \par \vskip 2em }% +\newcommand*{\coverpagetopmargin}{% + \dimexpr \topmargin+1in\relax +} +\newcommand*{\coverpagebottommargin}{% + 2\dimexpr\coverpagetopmargin\relax +} +\newcommand*{\coverpageleftmargin}{% + \dimexpr \evensidemargin+1in\relax +} +\newcommand*{\coverpagerightmargin}{\coverpageleftmargin} \scr@ifundefinedorrelax{titlepage}{% \newenvironment{titlepage}{% \if@twocolumn @@ -855,13 +1075,17 @@ \newcommand*\titlefont{\sectfont}% \newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newkomafont{subtitle}{\usekomafont{title}\large}% +\newkomafont{titlehead}{}% +\newkomafont{author}{\Large} +\newkomafont{date}{\Large} +\newkomafont{publishers}{\Large} +\newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: scrksect.dtx -\newcommand*\sectfont{\normalcolor\sffamily\bfseries} +%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $ \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: scrkmisc.dtx +%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $ \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname \@restonecolfalse @@ -929,13 +1153,13 @@ \providecommand*{\@textsubscript}[1]{% {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } -%%% From File: scrkpage.dtx +%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $ \newcommand*{\titlepagestyle}{plain} -%%% From File: scrkfloa.dtx +%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: scrkftn.dtx +%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $ \newcommand*{\ftn@rule@test@values}{% \ifdim\ftn@rule@height <\z@ \ClassWarning{\KOMAClassName}{% @@ -1090,7 +1314,7 @@ \endgroup \@footnotemark } -%%% From File: scrklist.dtx +%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $ \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% \list{}{\settowidth{\labelwidth}{{% @@ -1116,8 +1340,22 @@ \newenvironment{addmargin*}{% \@tempswafalse \if@twoside\ifthispageodd{}{\@tempswatrue}\fi + \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}% \@addmargin }{% + \unskip\nobreak\ifthispageodd{}{}% + \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else + \PackageWarning{scrextend}{% + page break inside `addmargin*' environment.\MessageBreak + A `addmargin*' environment starting on page + \scr@addmargin@startpage\MessageBreak + ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak + This will result in potential wrong margins on\MessageBreak + every other page.\MessageBreak + So maybe you should change the `addmargin*'\MessageBreak + environment, that ends% + }% + \fi \advance\@listdepth\@ne \endlist } @@ -1146,7 +1384,7 @@ } \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: scrlogo.dtx +%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} |