diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/typearea.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/typearea.sty | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 777c1136df4..9f3d0233d9e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -45,7 +45,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 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,16 +67,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (type area)] \typeout{% Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J% @@ -85,9 +85,9 @@ \@spaces\@spaces\@spaces\@spaces\space\space Copyright (C) Markus Kohm, 1994-^^J% } -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}} \newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}} \newlength{\ta@bcor} @@ -673,7 +673,7 @@ \KOMA@ifkey{usegeometry}{@ta@usegeometry} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \newcommand*{\scr@ta@compatibility}{\scr@compatibility} @@ -773,6 +773,8 @@ \@namedef{scr@v@3.16}{14} \@namedef{scr@v@3.17}{15} \@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@ta@v@is@lt}[1]{% \scr@ta@compatibility<\@nameuse{scr@v@#1} @@ -786,7 +788,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -1043,6 +1045,9 @@ \edef\reserved@a{% \noexpand\newcommand*{\unexpanded{#1}}{% \noexpand\scr@grouplevel@test\unexpanded{#1}% + \noexpand\csname scr@storeareas@before@hook\noexpand\endcsname + \unexpanded\expandafter\expandafter\expandafter{% + \csname scr@storeareas@before@current@hook\endcsname}% \noexpand\paperheight=\the\paperheight\space \noexpand\paperwidth=\the\paperwidth\space \noexpand\topmargin=\the\topmargin\space @@ -1076,10 +1081,26 @@ \unexpanded\expandafter\expandafter\expandafter{% \csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname}% }% + \unexpanded\expandafter\expandafter\expandafter{% + \csname scr@storeareas@after@current@hook\endcsname}% + \noexpand\csname scr@storeareas@after@hook\noexpand\endcsname }% }% \reserved@a } +\newcommand*{\BeforeRestoreareas}{% + \@ifstar{\scr@storeareashook{before@current}}{\scr@storeareashook{before}}% +} +\newcommand*{\AfterRestoreareas}{% + \@ifstar{\scr@storeareashook{after@current}}{\scr@storeareashook{after}}% +} +\newcommand*{\scr@storeareashook}[2]{% + \expandafter\l@addto@macro\csname scr@storeareas@#1@hook\endcsname{#2}% +} +\newcommand*{\scr@storeareas@before@hook}{} +\newcommand*{\scr@storeareas@before@current@hook}{} +\newcommand*{\scr@storeareas@after@hook}{} +\newcommand*{\scr@storeareas@after@current@hook}{} \newcommand*{\ta@divfor}[1]{% \if@mincl \PackageInfo{typearea}{% @@ -1483,7 +1504,7 @@ \fi } \typearea[current]{current} -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% |