summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-05 23:06:06 +0000
committerKarl Berry <karl@freefriends.org>2011-04-05 23:06:06 +0000
commit024228db99693079b2ebbc9aff20e89811eb8810 (patch)
tree8e8882ca17c8963d54f2abffdeeed1322cbdde66 /Master/texmf-dist/tex/latex/koma-script/scrbook.cls
parent4e8d3cd79b79589e4265bb196afe87ebaa3cc5cc (diff)
koma-script (5apr11)
git-svn-id: svn://tug.org/texlive/trunk@21983 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbook.cls')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls67
1 files changed, 46 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 73c7fd08645..c1e18435e6d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2010/10/01 v3.07a}
+\def\tocbasicversion{2011/03/23 v3.09}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -184,6 +184,8 @@
\@namedef{scr@v@3.07}{10}
\@namedef{scr@v@3.08}{10}
\@namedef{scr@v@3.08a}{10}
+\@namedef{scr@v@3.08b}{10}
+\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -693,32 +695,50 @@
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
%%% From File: scrkfloa.dtx
+\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
+\newif\if@figurecaptionabove\@figurecaptionabovefalse
\newif\ifonelinecaptions\onelinecaptionstrue
\newcommand*{\scap@pos}{r}
\newcommand*{\scap@valign}{b}
\KOMA@key{captions}{%
\KOMA@set@ncmdkey{captions}{@tempa}{%
- {tableheading}{0},%
- {tableabove}{0},{abovetable}{0},{abovetabular}{0},{topattable}{0},%
- {tablesignature}{1},%
- {tablebelow}{1},{belowtable}{1},{belowtabular}{1},{bottomattable}{1},%
- {oneline}{2},%
- {nooneline}{3},%
- {rightbeside}{4},{besideright}{4},%
- {leftbeside}{5},{besideleft}{5},%
- {innerbeside}{6},{besideinner}{6},%
- {outerbeside}{7},{besideouter}{7},%
- {topbeside}{8},{besidetop}{8},%
- {centeredbeside}{9},{besidecentered}{9},%
- {middlebeside}{9},{besidemiddle}{9},%
- {bottombeside}{10},{besidebottom}{10}%
+ {heading}{0},{above}{0},{top}{0},%
+ {signature}{1},{below}{1},{bot}{1},{bottom}{1},%
+ {tableheading}{2},%
+ {tableabove}{2},{abovetable}{2},{abovetabular}{2},{topattable}{2},%
+ {tablesignature}{3},%
+ {tablebelow}{3},{belowtable}{3},{belowtabular}{3},{bottomattable}{3},%
+ {figureheading}{4},{figureabove}{4},{abovefigure}{4},{topatfigure}{4},%
+ {figuresignature}{5},{figurebelow}{5},{belowfigure}{5},{bottomatfigure}{5},%
+ {oneline}{6},%
+ {nooneline}{7},%
+ {rightbeside}{8},{besideright}{8},%
+ {leftbeside}{9},{besideleft}{9},%
+ {innerbeside}{10},{besideinner}{10},%
+ {outerbeside}{11},{besideouter}{11},%
+ {topbeside}{12},{besidetop}{12},%
+ {centeredbeside}{13},{besidecentered}{13},%
+ {middlebeside}{13},{besidemiddle}{13},%
+ {bottombeside}{14},{besidebottom}{14}%
}{#1}%
\ifcase \@tempa\relax
\@tablecaptionabovetrue
+ \@figurecaptionabovetrue
+ \@captionabovetrue
+ \or
+ \@tablecaptionabovefalse
+ \@figurecaptionabovefalse
+ \@captionabovefalse
+ \or
+ \@tablecaptionabovetrue
\or
\@tablecaptionabovefalse
\or
+ \@figurecaptionabovetrue
+ \or
+ \@figurecaptionabovefalse
+ \or
\onelinecaptionstrue
\or
\onelinecaptionsfalse
@@ -1267,7 +1287,7 @@
\def\@list@extra{\aftergroup\@tempswatrue}%
\csname @listiv\endcsname
\endgroup
- \def\@listiv{\leftmargin\leftmarginiv
+ \edef\@listiv{\leftmargin\leftmarginiv
\labelwidth=\dimexpr \leftmargin-\labelsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -1276,7 +1296,7 @@
\def\@list@extra{\aftergroup\@tempswatrue}%
\csname @listv\endcsname
\endgroup
- \def\@listv{\leftmargin\leftmarginv
+ \edef\@listv{\leftmargin\leftmarginv
\labelwidth=\dimexpr \leftmargin-\labelsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -1285,7 +1305,7 @@
\def\@list@extra{\aftergroup\@tempswatrue}%
\csname @listvi\endcsname
\endgroup
- \def\@listvi{\leftmargin\leftmarginvi
+ \edef\@listvi{\leftmargin\leftmarginvi
\labelwidth=\dimexpr \leftmargin-\labelsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -2591,7 +2611,6 @@
\setlength{\abovecaptionskip}{10\p@}
\setlength{\belowcaptionskip}{0\p@}
\newcommand*{\captionformat}{:\ }
-\newif\if@captionabove\@captionabovefalse
\newcommand{\scr@caption}{}
\AtBeginDocument{\let\scr@caption\caption}
\newcommand{\captionabove}{\@captionabovetrue\scr@caption}
@@ -3057,7 +3076,9 @@
\setcounter{dbltopnumber}{2}
\renewcommand*\dbltopfraction{.7}
\renewcommand*\dblfloatpagefraction{.5}
-\newcommand*{\captionof}[1]{\def\@captype{#1}\caption}
+\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption}
+\newcommand*{\captionaboveof}{\@captionabovetrue\captionof}
+\newcommand*{\captionbelowof}{\@captionabovefalse\captionof}
\BeforePackage{capt-of}{\let\captionof\relax}
\newcommand*\figurename{Figure}
\newcommand*\tablename{Table}
@@ -3079,11 +3100,15 @@
\newcommand*{\ext@figure}{lof}
\newcommand*{\fnum@figure}{\figureformat}
\newenvironment{figure}{%
+ \if@figurecaptionabove\let\caption\captionabove
+ \else\let\caption\captionbelow\fi
\let\caption\captionbelow\@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
+ \if@figurecaptionabove\let\caption\captionabove
+ \else\let\caption\captionbelow\fi
\let\caption\captionbelow\@dblfloat{figure}%
}{%
\end@dblfloat