From 4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Dec 2014 23:18:10 +0000 Subject: koma-script (6dec14) git-svn-id: svn://tug.org/texlive/trunk@35754 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/koma-script/typearea.sty | 40 ++++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script/typearea.sty') diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 836273a82af..3f17c9df40b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -13,7 +13,7 @@ %% scrkernel-compatibility.dtx (with options: `package,typearea,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. %% --------------------------------------------------------------- @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% 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 @@ -67,12 +67,12 @@ \fi } \fi - \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}% + \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $ +%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2013/12/19 v3.12 KOMA-Script + 2014/10/28 v3.14 KOMA-Script package (type area)] \typeout{% Package typearea, \csname ver@typearea.sty\endcsname^^J% @@ -81,9 +81,9 @@ \@spaces\@spaces\@spaces\@spaces\space\space Copyright (C) Markus Kohm, 1994-^^J% } -%%% 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: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $ +%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $ \newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}} \newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}} \newlength{\ta@bcor} @@ -264,7 +264,9 @@ \fi \FamilyKeyStateProcessed } -\AtEndOfPackage{\KOMA@key{BCOR}{\typearea[{#1}]{last}}} +\AtEndOfPackage{% + \KOMA@key{BCOR}{\typearea[{#1}]{last}\FamilyKeyStateProcessed}% +} \KOMA@key{DIV}[calc]{% \edef\@tempa{#1}% \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv\fi @@ -279,7 +281,9 @@ \fi \FamilyKeyStateProcessed } -\AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}} +\AtEndOfPackage{% + \KOMA@key{DIV}{\typearea[current]{#1}\FamilyKeyStateProcessed}% +} \KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc} \KOMA@DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic} \KOMA@ifkey{areasetadvanced}{@areasetadvanced} @@ -313,7 +317,8 @@ \KOMA@key{twocolumn}[true]{% \if@atdocument\clearpage\fi \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% - \ifx\FamilyKeyState\FammilyKeyStateProcessed + \ifx\FamilyKeyState + \FamilyKeyStateProcessed \csname recalctypearea\endcsname \fi } @@ -613,7 +618,7 @@ } \DeclareOption*{% \x@paper} -%%% 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} \newcommand*{\scr@ta@compatibility}{\scr@compatibility} @@ -628,7 +633,9 @@ Because of this, version was set to `first'% }% }{% - \PackageInfoNoLine{scrextend}{% + \PackageInfoNoLine{% + typearea% + }{% Switching compatibility level to `#1'% }% \edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}% @@ -697,8 +704,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-typearea.dtx 1512 2013-11-11 10:35:04Z 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-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $ \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -1328,7 +1338,7 @@ \fi } \typearea[current]{current} -%%% 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: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% -- cgit v1.2.3