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 | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 7d67056013c..4b7c03c7aca 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -68,7 +68,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -263,6 +263,7 @@ \AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}} \KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc} \KOMA@DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic} +\KOMA@ifkey{areasetadvanced}{@areasetadvanced} \newif\if@semitwoside \g@addto@macro\@twosidetrue\@semitwosidefalse \g@addto@macro\@twosidefalse\@semitwosidefalse @@ -630,6 +631,8 @@ \@namedef{scr@v@3.09a}{10} \@namedef{scr@v@3.10}{10} \@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} \@namedef{scr@v@last}{10} %%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% @@ -783,6 +786,10 @@ \@ifstar \l@addto@macro \g@addto@macro \@typearea@end } \newcommand*{\@typearea@end}{} +\newcommand*{\AfterSettingArea}{% + \@ifstar \l@addto@macro \g@addto@macro \@areaset@end +} +\newcommand*{\@areaset@end}{} \newcommand*{\activateareas}{% \if@atdocument \PackageWarning{typearea}{% @@ -1115,7 +1122,15 @@ \ta@hblk=\paperwidth \advance\ta@hblk by-\ta@bcor \advance\ta@hblk by-\textwidth - \divide\ta@hblk by3 + \if@areasetadvanced + \if@mincl + \divide\ta@hblk by4 + \else + \divide\ta@hblk by3 + \fi + \else + \divide\ta@hblk by3 + \fi \oddsidemargin=-1in \evensidemargin=-1in \if@twoside @@ -1139,9 +1154,18 @@ \topskip=\@ptsize\p@ \advance\topskip by 10\p@ }% - \headheight=15\p@ - \advance\headheight by\f@size\p@ - \advance\headheight by-10\p@ + \if@areasetadvanced + \normalsize + \@ifundefined{ta@hh}{% + \headheight=1.25\baselineskip + }{% + \headheight=\ta@hh + }% + \else + \headheight=15\p@ + \advance\headheight by\f@size\p@ + \advance\headheight by-10\p@ + \fi \headsep=1.5\baselineskip \footskip=3.5\baselineskip \ta@vblk=\paperheight @@ -1154,8 +1178,8 @@ \if@fincl \advance\textheight by-\footskip \fi - \topmargin \ta@vblk - \advance\topmargin by-1in + \topmargin=-1in + \advance\topmargin by\ta@vblk \if@hincl \else \advance\topmargin by-\headheight \advance\topmargin by-\headsep @@ -1170,8 +1194,18 @@ \marginparwidth=\ta@hblk \fi \marginparsep=1cc + \if@areasetadvanced + \if@mincl + \marginparwidth=\ta@hblk + \if@twoside\if@semitwoside\else + \advance\evensidemargin by\marginparwidth + \fi\fi + \advance\marginparwidth by-\marginparsep + \fi + \fi \marginparpush=0.45\baselineskip \ta@layoutinfo{areaset}{}% + \@areaset@end \activateareas } \typearea[current]{current} |