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 | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index c7bc1aed94e..99acf116586 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2007/03/07 v2.97a KOMA-Script}% + \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -216,10 +216,12 @@ \endgroup \def\ta@hh{#1\baselineskip}% } +\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl} \KOMA@ifkey{headinclude}{@hincl} \KOMA@DeclareObsoleteOption[\PackageInfo]{headexclude}{% headinclude=false% } +\newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl} \KOMA@ifkey{footinclude}{@fincl} \KOMA@DeclareObsoleteOption[\PackageInfo]{footexclude}{% footinclude=false% @@ -251,12 +253,14 @@ \KOMA@DeclareObsoleteOption[\PackageInfo]{DIVcalc}{DIV=calc} \KOMA@DeclareObsoleteOption[\PackageInfo]{DIVclassic}{DIV=classic} \KOMA@key{twoside}[true]{% + \if@atdocument\if@twoside\cleardoublepage\else\clearpage\fi\fi \KOMA@set@ifkey{twoside}{@twoside}{#1}% \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi% \csname recalctypearea\endcsname } \KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false} \KOMA@key{twocolumn}[true]{% + \if@atdocument\clearpage\fi \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \csname recalctypearea\endcsname } @@ -413,6 +417,8 @@ } \newcommand*{\maybe@@pair}{} \def\@maybepair(#1,#2)\scr@next{\def\@tempa{#1}\def\@tempb{#2}}% +\DeclareOption*{% + \x@paper} \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -420,9 +426,13 @@ ***************************************% } }{} -\DeclareKeyValOption[\x@paper]{KOMA} -\KOMAoptions{headinclude=false,footinclude=false,paper=A4} -\ProcessOptions*\relax +\KOMAExecuteOptions{paper=A4} +\if@twoside + \KOMAExecuteOptions{twoside} +\else + \KOMAExecuteOptions{twoside=false} +\fi +\KOMAProcessOptions \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} \newlength{\ta@hblk} @@ -494,12 +504,13 @@ \if@fincl \advance\ta@temp by-\footskip \fi - \scr@ifundefined{@ptsize}{% + \scr@ifundefinedorrelax{@ptsize}{% \topskip=\f@size\p@ }{% \topskip=\@ptsize\p@ \advance\topskip by 10\p@ }% + \maxdepth=.5\topskip \textheight=\topskip \@whiledim\textheight <\ta@temp \do{\advance\textheight by\baselineskip}% @@ -565,7 +576,7 @@ \fi \hsize=\columnwidth \linewidth\hsize - \scr@ifundefined{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}% + \scr@ifundefinedorrelax{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}% \fi } \newcommand*{\ta@divfor}[1]{% @@ -613,7 +624,7 @@ \fi } \newcommand*\typearea[2][\z@]{% - \scr@ifundefined{currentgrouptype}{}{% + \scr@ifundefinedorrelax{currentgrouptype}{}{% \ifcase\currentgrouptype\else \PackageWarning{typearea}{% \string\typearea\space used at group level @@ -840,7 +851,7 @@ \advance\oddsidemargin by\ta@bcor \evensidemargin\oddsidemargin \fi - \scr@ifundefined{@ptsize}{% + \scr@ifundefinedorrelax{@ptsize}{% \topskip=\f@size\p@ }{% \topskip=\@ptsize\p@ |