summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls67
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls67
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty11
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty367
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty55
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls154
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls67
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty52
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty3
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco2
33 files changed, 736 insertions, 175 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 0f8188f7095..2efce460920 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 78272d6849f..35463aef556 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 5d5327f1ae1..e2858c958a4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index 21e507ba9d6..2f9c21e4757 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 50b372375d4..fe384673955 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index 48f03ff1de7..ee5f215d9db 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index ff4ef36643c..5de910ffd59 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index 21834fdfeef..a9901de1b8c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index 512c728e5a5..b8bdbf008c8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 88c7b914166..249cb32a4f4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index bc0eeae798b..9712972e1e2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index d28d329e5d0..b704cb86353 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index 62e35859e71..4d246cd208f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index 4e2a1813d49..f578e8e5711 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 1f22bd20247..d300bb6b9d2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.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}{%
scrartcl%
@@ -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
\addtotoclist{toc}
@@ -182,6 +182,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]{%
@@ -618,32 +620,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
@@ -1171,7 +1191,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
}%
@@ -1180,7 +1200,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
}%
@@ -1189,7 +1209,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
}%
@@ -2075,7 +2095,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}
@@ -2541,7 +2560,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}
@@ -2557,11 +2578,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
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index f6eb3aab17e..e563d128946 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -67,7 +67,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -248,7 +248,7 @@
\FamilyProcessOptions{KOMA}\relax
%%% From File: scrklang.dtx
%%% From File: scrlfile.dtx
-\def\scrlfileversion{2011/02/11 v3.08a}
+\def\scrlfileversion{2011/03/09 v3.09}
\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
\@tempa
%%% From File: scrkbase.dtx
@@ -680,7 +680,7 @@
}
\newcommand*{\Family@Numerical@Key}{}
\def\Family@Numerical@Key#1#2#3[#4]#5#6{%
- \@ifundefined{#5}{\@namedef{#5}{0}}%
+ \@ifundefined{#5}{\@namedef{#5}{0}}{}%
\ifx\relax#4\relax
\DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetNumerical{#2}{#3}{#5}{#6}{##1}}%
\else
@@ -718,10 +718,10 @@
}
\newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{%
\@ifnextchar [%]
- {\Family@String@Key{#1}{#2}{#3}}{\Family@@String@@Key{#1}{#2}{#3}}%
+ {\Family@@String@@Key{#1}{#2}{#3}}{\Family@String@Key{#1}{#2}{#3}}%
}
\newcommand*{\Family@@String@@Key}{}
-\long\def\Family@@Numerical@@Key#1#2#3[#4]#5{%
+\long\def\Family@@String@@Key#1#2#3[#4]#5{%
\DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\def#5{##1}}%
}
\newcommand{\Family@String@Key}[4]{%
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
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 174d65d776e..0261487420d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -66,7 +66,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrtime.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
@@ -159,11 +159,12 @@
\@namedef{date#1}{%
\expandafter\let\expandafter\@dayname\csname dayname@#1\endcsname
\@nameuse{D@date#1}}%
- \@ifundefined{languagename}{
+ \@ifundefined{languagename}{%
\scrdate@languagenamewarning
\ifnum\language=\@nameuse{l@#1}
\@nameuse{date#1}%
- \fi}{%
+ \fi
+ }{%
\@ifundefined{date\languagename}%
{}%
{\@nameuse{date\languagename}}%
@@ -176,6 +177,10 @@
{Donnerstag}{Freitag}{Samstag}{Sonntag}
\newdaylanguage{ngerman}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
+\newdaylanguage{naustrian}{Montag}{Dienstag}{Mittwoch}
+ {Donnerstag}{Freitag}{Samstag}{Sonntag}
+\newdaylanguage{austrian}{Montag}{Dienstag}{Mittwoch}
+ {Donnerstag}{Freitag}{Samstag}{Sonntag}
\newdaylanguage{english}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
\newdaylanguage{USenglish}{Monday}{Tuesday}{Wednesday}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 48343f8399f..8757a288438 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -97,7 +97,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrextend.dtx
\ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
@@ -223,6 +223,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]{%
@@ -602,7 +604,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
}%
@@ -611,7 +613,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
}%
@@ -620,7 +622,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
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
new file mode 100644
index 00000000000..7bae22fb1e5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -0,0 +1,367 @@
+%%
+%% This is file `scrfontsizes.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrkvers.dtx (with options: `package')
+%% scrkfont.dtx (with options: `package,generator,identify')
+%% scrkfont.dtx (with options: `package,generator,option')
+%% scrkfont.dtx (with options: `package,generator,body')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 1994-2011
+%% Markus Kohm and any individual authors listed elsewhere in this file.
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%%
+%%% From File: scrkvers.dtx
+\begingroup
+ \makeatletter
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+\endgroup
+%%% From File: scrkfont.dtx
+\ProvidesPackage{scrfontsizes}[%
+ \KOMAScriptVersion\space package
+ (font size file generator)]
+%%% From File: scrkfont.dtx
+\ProcessOptions\relax
+%%% From File: scrkfont.dtx
+\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
+\newcommand*{\generatefontfile}[1]{%
+ \ifstr{#1}{scrsize}{%
+ \ClassError{\KOMAClassName}{%
+ Font file name `scrsize' not allowed%
+ }{%
+ Font files with name `scrsize<fontsize>.clo' are reserved for
+ KOMA-Script.\MessageBreak
+ You should use another prefix and rename \string\@fontsizefilebase\space
+ either before\MessageBreak
+ loading a KOMA-Script class using one of \string\documentclass,
+ \string\LoadClass,\MessageBreak
+ or \string\LoadClassWithOptions\space or before loading package
+ `scrextend' using another\MessageBreak
+ class.}%
+ \@@@generatefontfile
+ }{%
+ \@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}%
+ }%
+}
+\newcommand*{\@generatefontfile}{}
+\def\@generatefontfile#1[#2]#3{%
+ \begingroup
+ \@ifundefined{setparsizes}{\setlength{\parskip}{0pt}}%
+ {\setparsizes{0pt}{0pt}{0pt}}%
+ \changefontsizes[{#2}]{#3}%
+ \generate@fontfile{#1}{#3}%
+ \endgroup
+}
+\newcommand\@@generatefontfile[2]{%
+ \begingroup
+ \@ifundefined{setparsizes}{\setlength{\parskip}{0pt}}%
+ {\setparsizes{0pt}{0pt}{0pt}}%
+ \changefontsizes{#2}%
+ \generate@fontfile{#1}{#2}%
+ \endgroup
+}
+\newcommand*{\@@@generatefontfile}[2][]{}
+\newcommand*{\@fontfile}{}
+\let\@fontfile\@mainaux
+\newcommand*{\generate@fontfile}[2]{%
+ \def\@ind{\space\space}%
+ \immediate\openout\@fontfile #1#2.clo
+ \immediate\write\@fontfile{\@percentchar^^J%
+ \@percentchar\space This is file `#1#2.clo', generated with^^J%
+ \@percentchar\space scrfontsizes
+ \csname ver@scrfontsizes.sty\endcsname,^^J%
+ \@percentchar\space Copyright (c) Markus Kohm.^^J%
+ \@percentchar^^J%
+ \string\ProvidesFile{#1#2.clo}[%
+ \the\year/\ifnum\month<10 0\fi\the\month/\ifnum\day<10 0\fi\the\day%
+ \space generated font size class option (#2)]}%
+ \immediate\write\@fontfile{%
+ \string\def\string\normalsize{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\normalsize{\f@size}{\f@baselineskip}%
+ \@percentchar^^J%
+ \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
+ \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J%
+ \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J%
+ \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J%
+ \@ind\string\let\string\@listi\string\@listI^^J%
+ }\@percentchar%
+ }%
+ \begingroup\small\@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\small{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}%
+ \@percentchar^^J%
+ \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
+ \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J%
+ \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J%
+ \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J%
+ \@ind\string\def\string\@listi{\@percentchar^^J%
+ \@ind\@ind\string\leftmargin\string\leftmargini^^J%
+ \@ind\@ind\string\topsep \the\topsep^^J%
+ \@ind\@ind\string\parsep \the\parsep^^J%
+ \@ind\@ind\string\itemsep \string\parsep^^J%
+ \@ind}\@percentchar^^J%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\footnotesize\@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\footnotesize{\@percentchar^^J%
+ \@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}%
+ \@percentchar^^J%
+ \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
+ \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J%
+ \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J%
+ \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J%
+ \@ind\string\def\string\@listi{\@percentchar^^J%
+ \@ind\@ind\string\leftmargin\string\leftmargini^^J%
+ \@ind\@ind\string\topsep \the\topsep^^J%
+ \@ind\@ind\string\parsep \the\parsep^^J%
+ \@ind\@ind\string\itemsep \string\parsep^^J%
+ \@ind}\@percentchar^^J%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\scriptsize
+ \immediate\write\@fontfile{%
+ \string\def\string\scriptsize{%
+ \string\@setfontsize\string\scriptsize{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\tiny
+ \immediate\write\@fontfile{%
+ \string\def\string\tiny{%
+ \string\@setfontsize\string\tiny{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\large
+ \immediate\write\@fontfile{%
+ \string\def\string\large{%
+ \string\@setfontsize\string\large{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\Large
+ \immediate\write\@fontfile{%
+ \string\def\string\Large{%
+ \string\@setfontsize\string\Large{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\LARGE
+ \immediate\write\@fontfile{%
+ \string\def\string\LARGE{%
+ \string\@setfontsize\string\LARGE{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\huge
+ \immediate\write\@fontfile{%
+ \string\def\string\huge{%
+ \string\@setfontsize\string\huge{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \begingroup\Huge
+ \immediate\write\@fontfile{%
+ \string\def\string\Huge{%
+ \string\@setfontsize\string\Huge{\f@size}{\f@baselineskip}%
+ }\@percentchar%
+ }%
+ \endgroup
+ \immediate\write\@fontfile{\string\normalsize}%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\footnotesep}{\the\footnotesep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\skip\string\footins}{\the\skip\footins}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\floatsep}{\the\floatsep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\textfloatsep}{\the\textfloatsep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\intextsep}{\the\intextsep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\dblfloatsep}{\the\dblfloatsep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\dbltextfloatsep}{\the\dbltextfloatsep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\@fptop}{\the\@fptop}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\@fpsep}{\the\@fpsep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\@fpbot}{\the\@fpbot}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\@dblfptop}{\the\@dblfptop}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\@dblfpsep}{\the\@dblfpsep}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\@dblfpbot}{\the\@dblfpbot}\@percentchar
+ }%
+ \immediate\write\@fontfile{%
+ \string\setlength{\string\partopsep}{\the\partopsep}\@percentchar
+ }%
+ \begingroup
+ \@listi
+ \immediate\write\@fontfile{%
+ \string\def\string\@listi{\@percentchar^^J%
+ \@ind\string\leftmargin\string\leftmargini^^J%
+ \@ind\string\topsep \the\topsep^^J%
+ \@ind\string\parsep \the\parsep^^J%
+ \@ind\string\itemsep \string\parsep^^J%
+ }\@percentchar
+ }%
+ \endgroup
+ \immediate\write\@fontfile{%
+ \string\let\string\@listI\string\@listi
+ }%
+ \begingroup
+ \@listii
+ \immediate\write\@fontfile{%
+ \string\def\string\@listii{\@percentchar^^J%
+ \@ind\string\leftmargin\string\leftmarginii^^J%
+ \@ind\string\labelwidth\string\leftmarginii^^J%
+ \@ind\string\advance\string\labelwidth-\string\labelsep^^J%
+ \@ind\string\topsep \the\topsep^^J%
+ \@ind\string\parsep \the\parsep^^J%
+ \@ind\string\itemsep \string\parsep^^J%
+ }\@percentchar
+ }%
+ \endgroup
+ \begingroup
+ \@listiii
+ \immediate\write\@fontfile{%
+ \string\def\string\@listiii{\@percentchar^^J%
+ \@ind\string\leftmargin\string\leftmarginiii^^J%
+ \@ind\string\labelwidth\string\leftmarginiii^^J%
+ \@ind\string\advance\string\labelwidth-\string\labelsep^^J%
+ \@ind\string\topsep \the\topsep^^J%
+ \@ind\string\parsep \the\parsep^^J%
+ \@ind\string\partopsep \the\partopsep^^J%
+ \@ind\string\itemsep \string\topsep^^J%
+ }\@percentchar
+ }%
+ \endgroup
+ \begingroup
+ \@listiv
+ \immediate\write\@fontfile{%
+ \string\def\string\@listiv{\@percentchar^^J%
+ \@ind\string\leftmargin\string\leftmarginiv^^J%
+ \@ind\string\labelwidth\string\leftmarginiv^^J%
+ \@ind\string\advance\string\labelwidth-\string\labelsep^^J%
+ }\@percentchar
+ }%
+ \endgroup
+ \begingroup
+ \@listv
+ \immediate\write\@fontfile{%
+ \string\def\string\@listv{\@percentchar^^J%
+ \@ind\string\leftmargin\string\leftmarginv^^J%
+ \@ind\string\labelwidth\string\leftmarginv^^J%
+ \@ind\string\advance\string\labelwidth-\string\labelsep^^J%
+ }\@percentchar
+ }%
+ \endgroup
+ \begingroup
+ \@listvi
+ \immediate\write\@fontfile{%
+ \string\def\string\@listvi{\@percentchar^^J%
+ \@ind\string\leftmargin\string\leftmarginvi^^J%
+ \@ind\string\labelwidth\string\leftmarginvi^^J%
+ \@ind\string\advance\string\labelwidth-\string\labelsep^^J%
+ }\@percentchar
+ }%
+ \endgroup
+ \immediate\write\@fontfile{%
+ \string\@ifundefined{@list@extra}{}{\@percentchar^^J%
+ \@ind\string\l@addto@macro{\string\@listi}{\string\@list@extra}%
+ \@percentchar^^J%
+ \@ind\string\let\string\@listI=\string\@listi^^J%
+ \@ind\string\l@addto@macro{\string\@listii}{\string\@list@extra}%
+ \@percentchar^^J%
+ \@ind\string\l@addto@macro{\string\@listiii}{\string\@list@extra}%
+ \@percentchar^^J%
+ \@ind\string\l@addto@macro{\string\footnotesize}{\string\protect
+ \string\add@extra@listi{ftns}}\@percentchar^^J%
+ \@ind\string\l@addto@macro{\string\small}{\string\protect
+ \string\add@extra@listi{sml}}\@percentchar^^J%
+ }\@percentchar^^J%
+ \string\@listi^^J%
+ \string\endinput^^J%
+ \@percentchar^^J%
+ \@percentchar\space End of file `#1#2.clo'.
+ }
+ \immediate\closeout\@fontfile
+}
+\@onlypreamble\generatefontfile
+%%% From File: scrlogo.dtx
+\@ifundefined{KOMAScript}{%
+ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
+ M\kern.05em A\kern.1em-\kern.1em Script}}}{}
+\endinput
+%%
+%% End of file `scrfontsizes.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 0ca01529a41..0866e3a42ab 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -66,7 +66,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrhack.dtx
%%% using: package,identify
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 4aad7968859..845428567d3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -67,7 +67,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -85,7 +85,7 @@
\KOMAProcessOptions\relax
%%% From File: scrkfont.dtx
%%% From File: scrlfile.dtx
-\def\scrlfileversion{2011/02/11 v3.08a}
+\def\scrlfileversion{2011/03/09 v3.09}
\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
\@tempa
%%% From File: scrkbase.dtx
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 6742cb82fdb..7ce524a34c4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -41,7 +41,7 @@
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
%%% From File: scrlfile.dtx
-\def\scrlfileversion{2011/02/11 v3.08a}
+\def\scrlfileversion{2011/03/09 v3.09}
\ProvidesPackage{scrlfile}[%
\scrlfileversion\space KOMA-Script package (loading files)]
\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
@@ -98,6 +98,7 @@
\noexpand\@onefilewithoptions{\csname #1.#4-@aliasname\endcsname}}%
\fi
\scr@@onefilewithoptions[{#2}][{#3}]{#4}%
+ \scr@load@hook{lateafter}{#1.#4}%
}
\newcommand*{\ReplaceFile}[2]{%
\expandafter\edef\csname #1-@alias\endcsname{#2}%
@@ -126,7 +127,31 @@
\newcommand*{\BeforeClass}[1]{%
\scr@set@load@hook{before}{#1.\@clsextension}}
\newcommand*{\AfterClass}{%
- \@ifstar {\@sAfterClass}{\@AfterClass}}
+ \@ifstar {\@sAfterClass}{%
+ \@ifnextchar +\@@AfterClass{%
+ \@ifnextchar !\@@@AfterClass\@AfterClass
+ }%
+ }%
+}
+\newcommand*{\@@@AfterClass}[2]{%
+ \begingroup\ifx\csname #2.\@clsextension-h@@k\endcsname\relax
+ \aftergroup\@sAfterClass
+ \else
+ \aftergroup\AfterAtEndOfClass
+ \fi
+ \endgroup{#2}%
+}
+\newcommand*{\AfterAtEndOfClass}[1]{%
+ \scr@set@load@hook{lateafter}{#1.\@clsextension}}
+\newcommand*{\@@AfterClass}[2]{%
+ \begingroup
+ \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax
+ \aftergroup\@sAfterClass
+ \else
+ \aftergroup\@AfterClass
+ \fi
+ \endgroup{#2}%
+}
\newcommand*{\@AfterClass}[1]{%
\scr@set@load@hook{after}{#1.\@clsextension}}
\newcommand*{\@sAfterClass}[1]{%
@@ -142,7 +167,31 @@
\newcommand*{\BeforePackage}[1]{%
\scr@set@load@hook{before}{#1.\@pkgextension}}
\newcommand*{\AfterPackage}{%
- \@ifstar {\@sAfterPackage}{\@AfterPackage}}
+ \@ifstar {\@sAfterPackage}{%
+ \@ifnextchar +\@@AfterPackage{%
+ \@ifnextchar !\@@@AfterPackage\@AfterPackage
+ }%
+ }%
+}
+\newcommand*{\@@@AfterPackage}[2]{%
+ \begingroup\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax
+ \aftergroup\@sAfterPackage
+ \else
+ \aftergroup\AfterAtEndOfPackage
+ \fi
+ \endgroup{#2}%
+}
+\newcommand*{\AfterAtEndOfPackage}[1]{%
+ \scr@set@load@hook{lateafter}{#1.\@pkgextension}}
+\newcommand*{\@@AfterPackage}[2]{%
+ \begingroup
+ \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax
+ \aftergroup\@sAfterPackage
+ \else
+ \aftergroup\@AfterPackage
+ \fi
+ \endgroup{#2}%
+}
\newcommand*{\@AfterPackage}[1]{%
\scr@set@load@hook{after}{#1.\@pkgextension}}
\newcommand*{\@sAfterPackage}[1]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 0858fdff444..df5aec63777 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -174,6 +174,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]{%
@@ -774,15 +776,29 @@
\expandafter\in@@#1#2\in@\in@@
}
\newif\if@refwide
+\newcommand*{\@datepos}{1}
\KOMA@key{refline}[wide]{%
\begingroup
- \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1}}{#1}%
+ \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1},%
+ {dateleft}{2},{leftdate}{2},%
+ {dateright}{3},{rightdate}{3},%
+ {nodate}{4}%
+ }{#1}%
\ifcase\@tempa
\endgroup
\@refwidetrue
- \else
+ \or
\endgroup
\@refwidefalse
+ \or
+ \endgroup
+ \def\@datepos{2}%
+ \or
+ \endgroup
+ \def\@datepos{1}%
+ \or
+ \endgroup
+ \def\@datepos{0}%
\fi
}
\newcommand{\subject@format}[1]{#1}
@@ -1096,7 +1112,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
}%
@@ -1105,7 +1121,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
}%
@@ -1114,7 +1130,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
}%
@@ -1465,6 +1481,24 @@
\providecaptionname{austrian}\wwwname{URL}%
\providecaptionname{austrian}\bankname{Bankverbindung}%
\g@addnumerical@date{austrian}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{naustrian}\yourrefname{Ihr Zeichen}%
+ \providecaptionname{naustrian}\yourmailname{Ihr Schreiben vom}%
+ \providecaptionname{naustrian}\myrefname{Unser Zeichen}%
+ \providecaptionname{naustrian}\customername{Kundennummer}%
+ \providecaptionname{naustrian}\invoicename{Rechnungsnummer}%
+ \providecaptionname{naustrian}\subjectname{Betrifft}%
+ \providecaptionname{naustrian}\ccname{Kopien an}%
+ \providecaptionname{naustrian}\enclname{Anlagen}%
+ \providecaptionname{naustrian}\headtoname{An}%
+ \providecaptionname{naustrian}\headfromname{Von}%
+ \providecaptionname{naustrian}\datename{Datum}%
+ \providecaptionname{naustrian}\pagename{Seite}%
+ \providecaptionname{naustrian}\phonename{Telefon}%
+ \providecaptionname{naustrian}\faxname{Fax}%
+ \providecaptionname{naustrian}\emailname{E-Mail}%
+ \providecaptionname{naustrian}\wwwname{URL}%
+ \providecaptionname{naustrian}\bankname{Bankverbindung}%
+ \g@addnumerical@date{naustrian}{\number\day.\,\number\month.\,\number\year}%
\providecaptionname{french}\yourrefname{Vos r\'ef\'erences}%
\providecaptionname{french}\yourmailname{Votre lettre du}%
\providecaptionname{french}\myrefname{Nos r\'ef\'erences}%
@@ -1653,6 +1687,10 @@
\captionsaustrian
\dateaustrian
\fi\fi
+ \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian
+ \captionsnaustrian
+ \datenaustrian
+ \fi\fi
\ifx\l@german\undefined\else\ifnum\language=\l@german
\captionsgerman
\dategerman
@@ -1715,7 +1753,7 @@
used language is `\languagename'.\MessageBreak
Supported languages are `english', `UKenglish',\MessageBreak
`british', `american', `USenglish',\MessageBreak
- `german', `ngerman', `austrian',\MessageBreak
+ `german', `ngerman', `austrian', `naustrian',\MessageBreak
`dutch', `italian', `spanish',\MessageBreak
`croatian', `finnish', `norsk'%
}%
@@ -1803,17 +1841,17 @@
\newcommand*{\@usekomavar}[2][\@firstofone]{%
\@ifundefined{scr@#2@var}{%
\@komavar@err{use}{#2}%
- }{%
+ }{%
#1{\@nameuse{scr@#2@var}}%
- }%
- }
+ }%
+}
\newcommand*{\@usekomaname}[2][\@firstofone]{%
\@ifundefined{scr@#2@var}{%
\@komavar@err{use}{#2}%
- }{%
+ }{%
#1{\@nameuse{scr@#2@name}}%
- }%
- }
+ }%
+}
\DeclareRobustCommand*{\ifkomavar}[1]{%
\scr@ifundefinedorrelax{scr@#1@var}{%
\expandafter\@secondoftwo
@@ -1855,7 +1893,7 @@
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
- }{%
+ }{%
\ClassError{scrlttr2}{%
pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
already defined%
@@ -3238,6 +3276,7 @@
\vskip-\useplength{locvpos}\move@frompt
}%
}
+\newcommand*{\do@set@reffield}{}
\newcommand*{\@set@reffield}[1]{%
\ifkomavarempty{#1}{}{%
\settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}%
@@ -3249,9 +3288,14 @@
\@tempswatrue
}%
}
+\newcommand*{\@test@reffield}[1]{%
+ \ifkomavarempty{#1}{}{%
+ \@tempswatrue
+ }%
+}
\newcommand*{\@set@reffields}{}%
\newcommand*{\addtoreffields}[1]{%
- \l@addto@macro{\@set@reffields}{\@set@reffield{#1}}%
+ \l@addto@macro{\@set@reffields}{\do@set@reffield{#1}}%
}
\newcommand*{\removereffields}{%
\renewcommand*{\@set@reffields}{}%
@@ -3281,7 +3325,8 @@
\@setplength{refhpos}{\oddsidemargin}%
\@addtoplength{refhpos}{1in}%
\fi
- \else\ifdim\useplength{refhpos}=\z@
+ \else
+ \ifdim\useplength{refhpos}=\z@
\begingroup
\setlength\@tempdima{\textwidth}%
\addtolengthplength[-]{\@tempdima}{refwidth}%
@@ -3301,52 +3346,49 @@
\fi\fi
\@tempswafalse
\move@topt\vskip\useplength{refvpos}%
- \rlap{\noindent\move@topl\hskip\useplength{refhpos}%
- \vbox{\hsize\useplength{refwidth}%
- \noindent\@set@reffields%
- \if@tempswa
- \setbox0\hbox{\usekomafont{refname}\strutbox}%
- \ifdim\ht0>\ht\strutbox
- \ClassWarningNoLine{scrlttr}{%
- Font element `refname' should not be larger than
- \string\normalsize!}%
- \fi
- \setbox0\hbox{\usekomafont{refvalue}\strutbox}%
- \ifdim\ht0>\ht\strutbox
- \ClassWarningNoLine{scrlttr}{%
- Font element `refvalue' should not be larger than
- \string\normalsize!}%
- \fi
- \fi
- \ifkomavarempty{date}{%
- \if@tempswa
- \typeout{Reference line(s): with fields but without date}%
- \else
- \typeout{Reference line(s): no}%
- \aftergroup\aftergroup\aftergroup\@tempswatrue
+ \@tempswafalse
+ \let\do@set@reffield\@test@reffield
+ \@set@reffields
+ \ifcase \@datepos\else\@test@reffield{date}\fi
+ \if@tempswa
+ \@tempswafalse
+ \rlap{\noindent\move@topl\hskip\useplength{refhpos}%
+ \vbox{\hsize\useplength{refwidth}%
+ \noindent
+ \ifnum \@datepos=2
+ \@set@reffields
+ \if@tempswa
+ \@tempswafalse
+ \@set@reffield{date}%
+ \fi
\fi
- }{%
+ \let\do@set@reffield\@set@reffield
+ \@set@reffields%
\if@tempswa
- \typeout{Reference line(s): with fields and date}%
- \settowidth{\@tempdima}{\strut
- \usekomafont{refvalue}\usekomavar{date}}%
- \setbox0\hbox{\usekomafont{refname}\usekomavar*{date}}%
- \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
- \enskip\hfill
- \parbox[t]{\@tempdima}{\noindent\raggedright%
- \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{date}}%
+ \ifnum \@datepos=1 \@set@reffield{date}\fi%
+ \setbox0\hbox{\usekomafont{refname}\strutbox}%
+ \ifdim\ht0>\ht\strutbox
+ \ClassWarningNoLine{scrlttr}{%
+ Font element `refname' should not be larger than
+ \string\normalsize!}%
+ \fi
+ \setbox0\hbox{\usekomafont{refvalue}\strutbox}%
+ \ifdim\ht0>\ht\strutbox
+ \ClassWarningNoLine{scrlttr}{%
+ Font element `refvalue' should not be larger than
+ \string\normalsize!}%
+ \fi
\else
- \typeout{Reference line: only place and date}%
- \enskip\hfill
- \ifkomavarempty{place}{}{%
- \usekomavar{place}\usekomavar{placeseparator}}%
- \usekomavar{date}%
- \@tempswatrue
+ \ifcase \@datepos\else
+ \ifnum \@datepos=1 \enskip\hfill\fi
+ \ifkomavarempty{place}{}{%
+ \usekomavar{place}\usekomavar{placeseparator}}%
+ \usekomavar{date}%
+ \fi
\fi
- }%
}%
}%
- \if@tempswa\vskip-\baselineskip\fi
+ \fi
\vskip\useplength{refaftervskip}%
}%
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 38c4bd9c997..9ff72bd7063 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.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}{%
scrreprt%
@@ -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]{%
@@ -697,32 +699,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
@@ -1271,7 +1291,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
}%
@@ -1280,7 +1300,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
}%
@@ -1289,7 +1309,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
}%
@@ -2567,7 +2587,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}
@@ -3033,7 +3052,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}
@@ -3051,11 +3072,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
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 80c02a3e0bf..17ae5f11ab1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrkfont.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index a503ef524f8..333c44f6926 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrkfont.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index 2b5f5832be1..1f97731ee81 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrkfont.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index 1ab08c7b25c..674fcc05614 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -66,7 +66,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrtime.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index c93fc431187..cb4c3c93e70 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -39,7 +39,7 @@
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2010/10/01 v3.07a}
+\def\tocbasicversion{2011/03/23 v3.09}
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocbasic}
[\tocbasicversion\space KOMA-Script package
@@ -230,7 +230,7 @@
\setlength{\parskip}{\z@}%
\setlength{\parindent}{\z@}%
\setlength{\parfillskip}{\z@\@plus 1fil}%
- \def\@currext{#1}%
+ \edef\@currext{#1}%
\csname tocbasic@@before@hook\endcsname
\csname tb@#1@before@hook\endcsname
\@starttoc{#1}%
@@ -283,7 +283,7 @@
}{%
\expandafter\let\expandafter\list@fname\csname listof#2name\endcsname
}%
- \def\@currext{#2}%
+ \edef\@currext{#2}%
\iftocfeature{\@currext}{onecolumn}{%
\iftocfeature{\@currext}{leveldown}{}{%
\if@twocolumn
@@ -495,6 +495,12 @@
\define@key{tocbasic}{floatpos}{%
\tb@ifvalueisnotempty{floatpos}{#1}{\edef\tb@nt@floatpos{#1}}%
}
+\define@key{tocbasic}{atbegin}{%
+ \tb@ifvalueisnotempty{atbegin}{#1}{\def\tb@nt@atbegin{#1}}%
+}
+\define@key{tocbasic}{atend}{%
+ \tb@ifvalueisnotempty{atend}{#1}{\def\tb@nt@atend{#1}}%
+}
\newcommand*{\DeclareNewTOC}[2][]{%
\tb@floatfalse
\tb@nonfloatfalse
@@ -510,7 +516,9 @@
\def\tb@nt@level{1}%
\def\tb@nt@indent{1em}%
\def\tb@nt@hang{1.5em}%
- \let\tb@nt@counterwithin\@empty%
+ \let\tb@nt@counterwithin\@empty
+ \let\tb@nt@atbegin\@empty
+ \let\tb@nt@atend\@empty
\setkeys{tocbasic}{#1}%
\expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}%
\expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext
@@ -553,19 +561,23 @@
\expandafter\newcommand\expandafter*\csname ftype@\tb@nt@type\expandafter
\endcsname{\tb@nt@floattype}%
\begingroup
- \edef\@tempa{%
- \noexpand\endgroup
- \noexpand\newenvironment{\tb@nt@type}{%
- \noexpand\@float{\tb@nt@type}%
- }{%
- \noexpand\end@float
- }%
- \noexpand\newenvironment{\tb@nt@type*}{%
- \noexpand\@dblfloat{\tb@nt@type}%
- }{%
- \noexpand\end@dblfloat
- }%
- }%
+ \edef\@tempa{%
+ \noexpand\endgroup
+ \noexpand\newenvironment{\tb@nt@type}{%
+ \noexpand\@float{\tb@nt@type}%
+ \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname
+ }{%
+ \noexpand\csname \tb@nt@type @atend\noexpand\endcsname
+ \noexpand\end@float
+ }%
+ \noexpand\newenvironment{\tb@nt@type*}{%
+ \noexpand\@dblfloat{\tb@nt@type}%
+ \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname
+ }{%
+ \noexpand\csname \tb@nt@type @atend\noexpand\endcsname
+ \noexpand\end@dblfloat
+ }%
+ }%
\@tempa
\@tempswatrue
\fi
@@ -577,7 +589,9 @@
\noexpand\trivlist\noexpand\item\noexpand\relax
\noexpand\minipage{\noexpand\linewidth}%
\noexpand\def\noexpand\@captype{\tb@nt@type}%
+ \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname
}{%
+ \noexpand\csname \tb@nt@type @atend\noexpand\endcsname
\noexpand\endminipage\noexpand\endtrivlist
}%
}%
@@ -617,6 +631,10 @@
}%
}%
\@tempa
+ \expandafter\newcommand\expandafter*\csname \tb@nt@type @atbegin\expandafter
+ \endcsname\expandafter{\tb@nt@atbegin}%
+ \expandafter\newcommand\expandafter*\csname \tb@nt@type @atend\expandafter
+ \endcsname\expandafter{\tb@nt@atend}%
\fi
}
\newcommand*{\tb@ifvalueisnotempty}[2]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 27a42c24aec..f940ae640b8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -664,7 +664,8 @@
but there's no TOC style `#2' defined.}%
}{%
\def\settocfeature{%
- \@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}%
+ \@ifnextchar[ %]
+ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}%
}%
\let\settocstylefeature\settocfeature
\expandafter\ifx\csname tocstyle@commandlist@#1\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 5fb111a5524..d260c8e8207 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{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrktare.dtx
\ProvidesPackage{typearea}[%
@@ -625,6 +625,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: scrktare.dtx
\InputIfFileExists{typearea.cfg}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index 48a148c0ed1..04ab8e94271 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%