summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/typearea.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/typearea.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty159
1 files changed, 106 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index eb193344299..c612137313a 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/12/24 v2.98 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}%
\endgroup
%%% From File: scrktare.dtx
\ProvidesPackage{typearea}[%
@@ -221,6 +221,12 @@
\endgroup
\def\ta@hh{#1\baselineskip}%
}
+\KOMA@key{headheight}{%
+ \begingroup
+ \setlength{\@tempdima}{#1}%
+ \endgroup
+ \def\ta@hh{#1}%
+}
\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
\KOMA@ifkey{headinclude}{@hincl}
\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{headexclude}{%
@@ -257,10 +263,27 @@
\AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}}
\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{DIVcalc}{DIV=calc}
\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{DIVclassic}{DIV=classic}
+\newif\if@semitwoside
+\g@addto@macro\@twosidetrue\@semitwosidefalse
+\g@addto@macro\@twosidefalse\@semitwosidefalse
\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%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
+ \@semitwosidetrue
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{@twoside}{#1}%
+ }%
+ \if@twoside
+ \if@semitwoside
+ \@mparswitchfalse
+ \else
+ \@mparswitchtrue
+ \fi
+ \else
+ \@mparswitchfalse
+ \fi%
\csname recalctypearea\endcsname
}
\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false}
@@ -347,8 +370,8 @@
\ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
}%
}
-\KOMA@DeclareObsoleteOption[\PackageWarning]{dvips}{%
- pagesize=dvips%
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{dvips}{%
+ pagesize=automedia%
}
\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{pdftex}{%
pagesize=pdftex%
@@ -444,7 +467,11 @@
}{}
\KOMAExecuteOptions{paper=A4}
\if@twoside
- \KOMAExecuteOptions{twoside}
+ \if@semitwoside
+ \KOMAExecuteOptions{twoside=semi}
+ \else
+ \KOMAExecuteOptions{twoside}
+ \fi
\else
\KOMAExecuteOptions{twoside=false}
\fi
@@ -464,7 +491,11 @@
\advance\marginparwidth by-\marginparsep
\else
\if@twoside
- \marginparwidth=1.5\ta@hblk
+ \if@semitwoside
+ \marginparwidth=\ta@hblk
+ \else
+ \marginparwidth=1.5\ta@hblk
+ \fi
\else
\marginparwidth=\ta@hblk
\fi
@@ -472,12 +503,18 @@
\oddsidemargin=-1in
\evensidemargin=-1in
\if@twoside
- \advance\oddsidemargin by\ta@hblk
- \advance\oddsidemargin by\ta@bcor
- \advance\evensidemargin by2\ta@hblk
- \if@mincl
- \advance\evensidemargin by\marginparwidth
- \advance\evensidemargin by\marginparsep
+ \if@semitwoside
+ \advance\oddsidemargin by1.5\ta@hblk
+ \advance\oddsidemargin by\ta@bcor
+ \evensidemargin=\oddsidemargin
+ \else
+ \advance\oddsidemargin by\ta@hblk
+ \advance\oddsidemargin by\ta@bcor
+ \advance\evensidemargin by2\ta@hblk
+ \if@mincl
+ \advance\evensidemargin by\marginparwidth
+ \advance\evensidemargin by\marginparsep
+ \fi
\fi
\else
\advance\oddsidemargin by1.5\ta@hblk
@@ -599,7 +636,7 @@
\if@mincl
\PackageInfo{typearea}{%
With option `mpinclude' there are no predefined\MessageBreak
- DIV-values. Using DIV calculation for good line\MessageBreak
+ DIV values. Using DIV calculation for good line\MessageBreak
width%
}%
\ta@div=2
@@ -787,62 +824,67 @@
\fi
\ifnum\@tempcnta <-15
\PackageWarningNoLine{typearea}{%
- Bad DIV-value!\MessageBreak
+ Bad DIV value!\MessageBreak
You should e.g. decrease DIV, increase fontsize\MessageBreak
or change papersize%
}%
\else
\ifnum\@tempcnta>15
\PackageWarningNoLine{typearea}{%
- Bad DIV-value!\MessageBreak
+ Bad DIV value!\MessageBreak
You should e.g. increase DIV, decrease fontsize\MessageBreak
or change papersize%
}
\fi\fi
\ifnum\ta@div <6
\PackageWarningNoLine{typearea}{%
- Very low DIV-value!\MessageBreak
- DIV-values less than 6 result in textwidth/-height\MessageBreak
+ Very low DIV value!\MessageBreak
+ DIV values less than 6 result in textwidth/-height\MessageBreak
smaller than total marginwidth/-height.\MessageBreak
You should e.g. increase DIV, increase fontsize or\MessageBreak
change papersize%
}
\fi
- \PackageInfo{typearea}{%
- These are the values describing the layout:\MessageBreak
- DIV\space\space=\space\number\ta@div\MessageBreak
- BCOR\space=\space\the\ta@bcor\MessageBreak
- \string\paperwidth\space\space\space\space\space\space=%
- \space\the\paperwidth\MessageBreak
- \space\string\textwidth\space\space\space\space\space\space=%
- \space\the\textwidth\MessageBreak
- \space DIV-departure\space\space\space=%
- \space\the\@tempcnta/100\MessageBreak
- \space\string\evensidemargin\space=%
- \space\the\evensidemargin\MessageBreak
- \space\string\oddsidemargin\space\space=%
- \space\the\oddsidemargin\MessageBreak
- \string\paperheight\space\space\space\space\space=%
- \space\the\paperheight\MessageBreak
- \space\string\textheight\space\space\space\space\space=%
- \space\the\textheight\MessageBreak
- \space\string\topmargin\space\space\space\space\space\space=%
- \space\the\topmargin\MessageBreak
- \space\string\headheight\space\space\space\space\space=%
- \space\the\headheight\MessageBreak
- \space\string\headsep\space\space\space\space\space\space\space\space=%
- \space\the\headsep\MessageBreak
- \space\string\topskip\space\space\space\space\space\space\space\space=%
- \space\the\topskip\MessageBreak
- \space\string\footskip\space\space\space\space\space\space\space=%
- \space\the\footskip\MessageBreak
- \space\string\baselineskip\space\space\space=%
- \space\the\baselineskip\MessageBreak
- }%
+ \ta@layoutinfo{\number\ta@div}{\the\@tempcnta}%
\@typearea@end
\activateareas
\fi
}
+\newcommand*{\ta@layoutinfo}[2]{%
+ \PackageInfo{typearea}{%
+ These are the values describing the layout:\MessageBreak
+ DIV\space\space=\space#1\MessageBreak
+ BCOR\space=\space\the\ta@bcor\MessageBreak
+ \string\paperwidth\space\space\space\space\space\space=%
+ \space\the\paperwidth\MessageBreak
+ \space\string\textwidth\space\space\space\space\space\space=%
+ \space\the\textwidth\MessageBreak
+ \ifx\relax#2\relax\else
+ \space DIV departure\space\space\space=%
+ \space#2\@percentchar\MessageBreak
+ \fi
+ \space\string\evensidemargin\space=%
+ \space\the\evensidemargin\MessageBreak
+ \space\string\oddsidemargin\space\space=%
+ \space\the\oddsidemargin\MessageBreak
+ \string\paperheight\space\space\space\space\space=%
+ \space\the\paperheight\MessageBreak
+ \space\string\textheight\space\space\space\space\space=%
+ \space\the\textheight\MessageBreak
+ \space\string\topmargin\space\space\space\space\space\space=%
+ \space\the\topmargin\MessageBreak
+ \space\string\headheight\space\space\space\space\space=%
+ \space\the\headheight\MessageBreak
+ \space\string\headsep\space\space\space\space\space\space\space\space=%
+ \space\the\headsep\MessageBreak
+ \space\string\topskip\space\space\space\space\space\space\space\space=%
+ \space\the\topskip\MessageBreak
+ \space\string\footskip\space\space\space\space\space\space\space=%
+ \space\the\footskip\MessageBreak
+ \space\string\baselineskip\space\space\space=%
+ \space\the\baselineskip\MessageBreak
+ }%
+}
\AtEndOfPackage{\newcommand*{\recalctypearea}{\typearea[current]{last}}}
\newcommand*\areaset[3][\z@]{%
\edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else
@@ -859,9 +901,15 @@
\oddsidemargin=-1in
\evensidemargin=-1in
\if@twoside
- \advance\oddsidemargin by\ta@hblk
- \advance\oddsidemargin by\ta@bcor
- \advance\evensidemargin by2\ta@hblk
+ \if@semitwoside
+ \advance\oddsidemargin by1.5\ta@hblk
+ \advance\oddsidemargin by\ta@bcor
+ \evensidemargin\oddsidemargin
+ \else
+ \advance\oddsidemargin by\ta@hblk
+ \advance\oddsidemargin by\ta@bcor
+ \advance\evensidemargin by2\ta@hblk
+ \fi
\else
\advance\oddsidemargin by1.5\ta@hblk
\advance\oddsidemargin by\ta@bcor
@@ -895,12 +943,17 @@
\advance\topmargin by-\headsep
\fi
\if@twoside
- \marginparwidth=1.5\ta@hblk
+ \if@semitwoside
+ \marginparwidth=\ta@hblk
+ \else
+ \marginparwidth=1.5\ta@hblk
+ \fi
\else
\marginparwidth=\ta@hblk
\fi
\marginparsep=1cc
\marginparpush=0.45\baselineskip
+ \ta@layoutinfo{areaset}{}%
\activateareas
}
\typearea[current]{current}