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.cls220
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls236
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty181
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty154
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty132
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty109
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls159
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage.sty1
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty157
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls236
-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.sty47
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty219
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty24
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco2
33 files changed, 1083 insertions, 838 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 77acc43059a..3444081ccb6 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 e90d589d484..e4c48ef6957 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 fdf097eff99..fe0eec501e2 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 f5ccc9f9e4a..5a23cc4b92b 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 c0a98338283..c64de4b7974 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 ed1786ec31e..03c9352f2c1 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 0b5a0b3322d..897b8621fb7 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 b36bc04d831..6bb13eaedd5 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 9f21c773769..25c8685db9a 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 f38783da84c..e35a376b2be 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 ccc32795df4..0042deb4664 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 d1b11594fc5..9a8bd2f18d3 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 a47d1e9f321..71bc6b95386 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 a136d92e236..c5dd9968496 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 c6ed59bce1b..7e2132dff63 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2010/01/05 v3.04b}
+\def\tocbasicversion{2010/06/09 v3.06}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\addtotoclist{toc}
@@ -175,8 +175,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{10}
\@namedef{scr@v@3.04a}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.05a}{10}
+\@namedef{scr@v@3.06}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -748,6 +750,7 @@
{flat}{3},{left}{3},%
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
+ {entryprefix}{6},
}{#1}%
\ifcase \@tempa\relax
\renewcommand*{\float@@listhead}{%
@@ -757,6 +760,10 @@
\unsettoc{\@currext}{numbered}%
\unsettoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
\or% totoc
\renewcommand*{\float@@listhead}{%
\addsec
@@ -765,6 +772,10 @@
\unsettoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% numbered
\renewcommand*{\float@@listhead}{%
\section
@@ -773,6 +784,10 @@
\setuptoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% flat
\@dynlisttrue
\or% graduated
@@ -781,6 +796,29 @@
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
\fi
}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
@@ -1180,109 +1218,6 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-\newcommand*{\setkomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be set}{%
- You've told me to redefine the font selection of the
- element,\MessageBreak%
- but either no such element is known by
- KOMA-Script\MessageBreak%
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to redefine the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\setkomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\addtokomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be extended%
- }{%
- You've told me to extend the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to extend the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\addtokomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\l@addto@macro
- \csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\usekomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be used%
- }{%
- You've told me to use the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to use the font selection of the
- element\MessageBreak
- `#1' that is an alias of element `\csname
- scr@fnt@instead@#1\endcsname'\MessageBreak
- }%
- \expandafter\expandafter\expandafter\usekomafont
- \expandafter\expandafter\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}%
- }%
- }{%
- \@nameuse{scr@fnt@#1}%
- }%
-}
-\newcommand*{\newkomafont}[3][\relax]{%
- \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
- \expandafter\expandafter\expandafter\newcommand
- \expandafter\expandafter\expandafter*%
- \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
- \csname @#2font\endcsname%
- }%
- \ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
- \fi
-}
-\newcommand*{\aliaskomafont}[2]{%
- \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
- #2%
- }%
-}
%%% From File: scrklang.dtx
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -1835,9 +1770,9 @@
\newcommand*{\raggedpart}{}
\let\raggedpart\raggedsection
\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
-\newkomafont{partentry}{\usekomafont{sectioning}\large}
+\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
-\newkomafont{sectionentry}{\usekomafont{sectioning}}
+\newkomafont{sectionentry}{\usekomafont{disposition}}
\newkomafont{sectionentrypagenumber}{}
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
@@ -2634,10 +2569,54 @@
}
%%% From File: scrkftn.dtx
\renewcommand*\footnoterule{%
- \kern-3\p@
+ \normalsize\ftn@rule@test@values
+ \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
\ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
- \hrule\@width.4\columnwidth
+ \hrule \@height\ftn@rule@height \@width\ftn@rule@width
\kern 2.6\p@}
+\newcommand*{\ftn@rule@test@values}{%
+ \ifdim\ftn@rule@height <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ less than 0%
+ }%
+ \else
+ \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ greater than \the\dimexpr\skip\footins -2.6\p@\relax
+ }%
+ \fi
+ \fi
+ \ifdim\ftn@rule@width <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ less than 0pt%
+ }%
+ \else
+ \ifdim\ftn@rule@width >\columnwidth
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ greater than \string\columnwidth
+ }%
+ \fi
+ \fi
+}
+\newcommand*{\ftn@rule@width}{.4\columnwidth}
+\newcommand*{\ftn@rule@height}{.4\p@}
+\newcommand*{\setfootnoterule}[2][]{%
+ \ifstr{#1}{}{}{%
+ \renewcommand*{\ftn@rule@height}{#1}%
+ }%
+ \ifstr{#2}{}{}{%
+ \renewcommand*{\ftn@rule@width}{#2}%
+ }%
+ \ftn@rule@test@values
+}
\newcommand\deffootnote[4][]{%
\long\def\@makefntext##1{%
\setlength{\@tempdimc}{#3}%
@@ -2715,12 +2694,18 @@
}
%%% From File: scrkliof.dtx
\renewcommand*{\numberline}[1]{%
- \hb@xt@\@tempdima{#1\autodot\hfil}}
+ \numberline@box{%
+ \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ }%
+}
+\newcommand*{\numberline@prefix}{}
+\newcommand*{\numberline@postfix}{\hfil}
+\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
\newcommand*\@dotsep{4.5}
\newcommand*{\scr@dottedtocline}{}
-\newcommand*{\scr@numberline}{}
\newcommand*{\last@l@number}{}
\newcommand*{\@l@number}{}
\newcommand*{\set@l@number}[1]{%
@@ -2731,14 +2716,13 @@
\ifdim\@tempdima >\last@l@number \else
\setlength{\@tempdima}{\last@l@number}%
\fi%
- }
+}
\newcommand*{\before@starttoc}[1]{
\let\scr@dottedtocline=\@dottedtocline
\renewcommand*{\@dottedtocline}[3]{%
\scr@dottedtocline{##1}{\z@}{\last@l@number}}%
- \let\scr@numberline=\numberline
- \renewcommand*{\numberline}[1]{%
- \set@l@number{##1}\scr@numberline{##1}}%
+ \renewcommand*{\numberline@box}[1]{%
+ \set@l@number{##1}\hb@xt@\@tempdima{##1}}%
\gdef\@l@number{\z@}%
\@ifundefined{#1@l@number}{%
\def\last@l@number{2em}%
@@ -2814,8 +2798,10 @@
}
\newcommand*\listfigurename{List of Figures}
\newcommand*\listoflofname{\listfigurename}
+\newcommand*\listoflofentryname{\figurename}
\newcommand*\listtablename{List of Tables}
\newcommand*\listoflotname{\listtablename}
+\newcommand*\listoflotentryname{\tablename}
\newcommand*\listoffigures{\listoftoc{lof}}
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
@@ -3063,7 +3049,7 @@
\setlength{\itemindent}{\z@}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
- \setlength{\partopsep}{\parskip}%
+ \setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index ff90d0d74ab..20320f26752 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -252,6 +252,12 @@
\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
\@tempa
%%% From File: scrkbase.dtx
+\newcommand*{\XdivY}[2]{%
+ \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
+}
+\newcommand*{\XmodY}[2]{%
+ \numexpr #1 - #2 * \XdivY{#1}{#2}\relax
+}
\newif\if@atdocument
\AtBeginDocument{\@atdocumenttrue}
\@onlypreamble\@atdocumentrue
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 76c85f77a6c..1906c4214af 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2010/01/05 v3.04b}
+\def\tocbasicversion{2010/06/09 v3.06}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -177,8 +177,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{10}
\@namedef{scr@v@3.04a}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.05a}{10}
+\@namedef{scr@v@3.06}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -823,10 +825,11 @@
{flat}{3},{left}{3},%
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
- {chapterentry}{6},{withchapterentry}{6},%
- {nochaptergap}{7},{ignorechapter}{7},%
- {chaptergapsmall}{8},{smallchaptergap}{8},%
- {chaptergapline}{9},{onelinechaptergap}{9}%
+ {entryprefix}{6},
+ {chapterentry}{7},{withchapterentry}{7},%
+ {nochaptergap}{8},{ignorechapter}{8},%
+ {chaptergapsmall}{9},{smallchaptergap}{9},%
+ {chaptergapline}{10},{onelinechaptergap}{10}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*{\float@@listhead}{%
@@ -836,6 +839,10 @@
\unsettoc{\@currext}{numbered}%
\unsettoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
\or% totoc
\renewcommand*{\float@@listhead}{%
\addchap
@@ -844,6 +851,10 @@
\unsettoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% numbered
\renewcommand*{\float@@listhead}{%
\chapter
@@ -852,6 +863,10 @@
\setuptoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% flat
\@dynlisttrue
\or% graduated
@@ -860,6 +875,29 @@
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
\or% chapterentry
\KOMA@options{chapteratlists=entry}{}%
\or% chaptergap
@@ -1281,109 +1319,6 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-\newcommand*{\setkomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be set}{%
- You've told me to redefine the font selection of the
- element,\MessageBreak%
- but either no such element is known by
- KOMA-Script\MessageBreak%
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to redefine the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\setkomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\addtokomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be extended%
- }{%
- You've told me to extend the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to extend the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\addtokomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\l@addto@macro
- \csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\usekomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be used%
- }{%
- You've told me to use the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to use the font selection of the
- element\MessageBreak
- `#1' that is an alias of element `\csname
- scr@fnt@instead@#1\endcsname'\MessageBreak
- }%
- \expandafter\expandafter\expandafter\usekomafont
- \expandafter\expandafter\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}%
- }%
- }{%
- \@nameuse{scr@fnt@#1}%
- }%
-}
-\newcommand*{\newkomafont}[3][\relax]{%
- \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
- \expandafter\expandafter\expandafter\newcommand
- \expandafter\expandafter\expandafter*%
- \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
- \csname @#2font\endcsname%
- }%
- \ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
- \fi
-}
-\newcommand*{\aliaskomafont}[2]{%
- \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
- #2%
- }%
-}
%%% From File: scrklang.dtx
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -1964,8 +1899,6 @@
\@afterindentfalse
\secdef\@chapter\@schapter
}
-\setuptoc{lof}{chapteratlist}
-\setuptoc{lot}{chapteratlist}
\newcommand*{\@chapter}{}
\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
\if@mainmatter
@@ -2222,9 +2155,9 @@
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
-\newkomafont{partentry}{\usekomafont{sectioning}\large}
+\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
-\newkomafont{chapterentry}{\usekomafont{sectioning}}
+\newkomafont{chapterentry}{\usekomafont{disposition}}
\newkomafont{chapterentrypagenumber}{}
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
@@ -3161,10 +3094,54 @@
}
%%% From File: scrkftn.dtx
\renewcommand*\footnoterule{%
- \kern-3\p@
+ \normalsize\ftn@rule@test@values
+ \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
\ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
- \hrule\@width.4\columnwidth
+ \hrule \@height\ftn@rule@height \@width\ftn@rule@width
\kern 2.6\p@}
+\newcommand*{\ftn@rule@test@values}{%
+ \ifdim\ftn@rule@height <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ less than 0%
+ }%
+ \else
+ \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ greater than \the\dimexpr\skip\footins -2.6\p@\relax
+ }%
+ \fi
+ \fi
+ \ifdim\ftn@rule@width <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ less than 0pt%
+ }%
+ \else
+ \ifdim\ftn@rule@width >\columnwidth
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ greater than \string\columnwidth
+ }%
+ \fi
+ \fi
+}
+\newcommand*{\ftn@rule@width}{.4\columnwidth}
+\newcommand*{\ftn@rule@height}{.4\p@}
+\newcommand*{\setfootnoterule}[2][]{%
+ \ifstr{#1}{}{}{%
+ \renewcommand*{\ftn@rule@height}{#1}%
+ }%
+ \ifstr{#2}{}{}{%
+ \renewcommand*{\ftn@rule@width}{#2}%
+ }%
+ \ftn@rule@test@values
+}
\@addtoreset{footnote}{chapter}
\newcommand\deffootnote[4][]{%
\long\def\@makefntext##1{%
@@ -3242,13 +3219,25 @@
\@footnotemark
}
%%% From File: scrkliof.dtx
+\doforeachtocfile[float]{%
+ \setuptoc{\@currext}{chapteratlist}%
+}
+\AtAddToTocList[float]{%
+ \setuptoc{\@currext}{chapteratlist}%
+}
\renewcommand*{\numberline}[1]{%
- \hb@xt@\@tempdima{#1\autodot\hfil}}
+ \numberline@box{%
+ \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ }%
+}
+\newcommand*{\numberline@prefix}{}
+\newcommand*{\numberline@postfix}{\hfil}
+\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
\newcommand*\@dotsep{4.5}
\newcommand*{\scr@dottedtocline}{}
-\newcommand*{\scr@numberline}{}
\newcommand*{\last@l@number}{}
\newcommand*{\@l@number}{}
\newcommand*{\set@l@number}[1]{%
@@ -3259,14 +3248,13 @@
\ifdim\@tempdima >\last@l@number \else
\setlength{\@tempdima}{\last@l@number}%
\fi%
- }
+}
\newcommand*{\before@starttoc}[1]{
\let\scr@dottedtocline=\@dottedtocline
\renewcommand*{\@dottedtocline}[3]{%
\scr@dottedtocline{##1}{\z@}{\last@l@number}}%
- \let\scr@numberline=\numberline
- \renewcommand*{\numberline}[1]{%
- \set@l@number{##1}\scr@numberline{##1}}%
+ \renewcommand*{\numberline@box}[1]{%
+ \set@l@number{##1}\hb@xt@\@tempdima{##1}}%
\gdef\@l@number{\z@}%
\@ifundefined{#1@l@number}{%
\def\last@l@number{2em}%
@@ -3342,8 +3330,10 @@
}
\newcommand*\listfigurename{List of Figures}
\newcommand*\listoflofname{\listfigurename}
+\newcommand*\listoflofentryname{\figurename}
\newcommand*\listtablename{List of Tables}
\newcommand*\listoflotname{\listtablename}
+\newcommand*\listoflotentryname{\tablename}
\newcommand*\listoffigures{\listoftoc{lof}}
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
@@ -3592,7 +3582,7 @@
\setlength{\itemindent}{\z@}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
- \setlength{\partopsep}{\parskip}%
+ \setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index d7d4b14bb16..7fc36527f27 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -4,7 +4,11 @@
%%
%% The original source files were:
%%
-%% scrtime.dtx (with options: `scrdate')
+%% scrkvers.dtx (with options: `package,scrdate')
+%% scrtime.dtx (with options: `package,scrdate,identify')
+%% scrkbase.dtx (with options: `load')
+%% scrtime.dtx (with options: `package,scrdate,option')
+%% scrtime.dtx (with options: `package,scrdate,body')
%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2010
@@ -40,73 +44,116 @@
%% 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{2010/06/17 v3.06 KOMA-Script}%
+\endgroup
%%% From File: scrtime.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{scrdate}
- [2009/01/01 v1.1p LaTeX2e KOMA-Script
- package]
-\newcommand\todaysname{%
- \begingroup%
- \@tempcnta=\year
- \@tempcntb=1 % 1. Januar 1980 war ein Dienstag
- \ifnum\@tempcnta<1980 unknown\else%
- \advance\@tempcnta by-1980%
- \@whilenum\@tempcnta>3\do%
- {\advance\@tempcntb by5\advance\@tempcnta by-4}%
- \ifnum\@tempcnta=0%
- \ifnum\month>2\advance \@tempcntb by1\fi%
- \else%
- \advance\@tempcntb by\@tempcnta%
- \advance\@tempcntb by1
- \fi%
- \ifcase\month\or\or\advance\@tempcntb3% Jan = 28 + 3
- \or\advance\@tempcntb3% +Feb = 56 + 3
- \or\advance\@tempcntb6% +Mar = 84 + 6
- \or\advance\@tempcntb1% +Apr = 119 + 1
- \or\advance\@tempcntb4% +May = 147 + 4
- \or\advance\@tempcntb6% +Jun = 175 + 6
- \or\advance\@tempcntb2% +Jul = 210 + 2
- \or\advance\@tempcntb5% +Aug = 238 + 5
- \or% +Sep = 273 + 0
- \or\advance\@tempcntb3% +Oct = 301 + 3
- \or\advance\@tempcntb5% +Nov = 329 + 5
- \fi%
- \advance\@tempcntb by\day%
- \advance\@tempcntb by-1% die Zaehlung beginnt bei 0
- \@whilenum\@tempcntb>6\do%
- {\advance\@tempcntb by-7}%
- \@dayname{\@tempcntb}%
- \fi\endgroup}
-\newcommand\nameday[1]{\renewcommand\todaysname{#1}}
-\newcommand*\scrdate@languagenamewarning{
+\ProvidesPackage{scrdate}[%
+ \KOMAScriptVersion\space package (%
+ day of the week)]
+%%% From File: scrkbase.dtx
+\RequirePackage{scrkbase}[\KOMAScriptVersion]
+%%% From File: scrtime.dtx
+%%% From File: scrtime.dtx
+\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
+\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
+\newcommand*{\@GaussYear}[3]{%
+ \ifcase #2
+ \PackageError{scrdate}{month out of range}{%
+ You've asked for the Gauss year of ISO date #1-#2-#3,\MessageBreak
+ this means, that month hat invalid value '#2'.}%
+ \or
+ \numexpr #1 - 1\relax
+ \or
+ \numexpr #1 - 1\relax
+ \else
+ #1
+ \fi
+}
+\newcommand*{\DayNumber}[3]{%
+ \XmodY{%
+ \numexpr #3
+ + \ifcase #2
+ \PackageError{scrdate}{month out of range}{%
+ You've asked for the dayname of ISO date #1-#2-#3,\MessageBreak
+ this means, that month hat invalid value '#2'.}%
+ \or 28 \or 31 \or 2 \or 5 \or 7 \or 10 \or 12 \or 15 \or 18
+ \or 20 \or 23 \or 25
+ \else
+ \PackageError{scrdate}{month out of range}{%
+ You've asked for the dayname of ISO date #1-#2-#3,\MessageBreak
+ this means, that month hat invalid value '#2'.}%
+ \fi
+ + \DecadePart{\@GaussYear{#1}{#2}{#3}}
+ + \XdivY{\DecadePart{\@GaussYear{#1}{#2}{#3}}}{4}
+ + \XdivY{\CenturyPart{\@GaussYear{#1}{#2}{#3}}}{4}
+ - 2 * \CenturyPart{\@GaussYear{#1}{#2}{#3}} \relax
+ }{7}%
+}
+\newcommand*{\ISODayNumber}[1]{\expandafter\@IsoDayNumber#1\@nil}
+\newcommand*{\@IsoDayNumber}{}
+\def\@IsoDayNumber#1-#2-#3\@nil{\DayNumber{#1}{#2}{#3}}
+\newcommand*{\DayName}[3]{\@dayname{\DayNumber{#1}{#2}{#3}}}
+\newcommand*{\ISODayName}[1]{\@dayname{\ISODayNumber{#1}}}
+\newcommand*{\DayNameByNumber}[1]{%
+ \@dayname{\XmodY{#1}{7}}%
+}
+\newcommand*{\ISOToday}{%
+ \the\year-\ifnum \month<10 0\fi\the\month-\ifnum \day<10 0\fi\the\day%
+}
+\newcommand*{\IsoToday}{%
+ \the\year-\the\month-\the\day%
+}
+\newcommand*{\todaysname}{\DayName{\year}{\month}{\day}}
+\newcommand*{\todaysnumber}{\DayNumber{\year}{\month}{\day}}
+\newcommand\nameday[1]{\renewcommand*{\todaysname}{#1}}
+\newcommand*\scrdate@languagenamewarning{%
\PackageWarningNoLine{scrdate}
{\string\languagename\space not
defined, using \string\language.\MessageBreak
This may result in use of wrong language!\MessageBreak
You should use a compatible language
package\MessageBreak
- (e.g. `Babel', `german', `french', ...)}
+ (e.g. `Babel', `german', `french', ...)}%
\let\scrdate@languagenamewarning\relax}
\newcommand\newdaylanguage[8]{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname l@#1\endcsname\relax
- \PackageWarningNoLine{scrdate}{Language #1\space not defined.\MessageBreak
- \protect\dayname@#1\space skipped!}
- \else
+ \scr@ifundefinedorrelax{l@#1}{%
+ \PackageInfo{scrdate}{Language #1\space not defined.\MessageBreak
+ \protect\dayname@#1\space skipped!}%
+ }{%
\@namedef{dayname@#1}##1{%
- \begingroup%
- \@tempcnta ##1%
- \ifcase\@tempcnta%
- #2\or #3\or #4\or #5\or #6\or #7\or #8\fi\endgroup%
- }
- \AtBeginDocument{
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname date#1\endcsname\relax
+ \ifcase ##1
+ #8\or #2\or #3\or #4\or #5\or #6\or #7\fi%
+ }%
+ \AtBeginDocument{%
+ \scr@ifundefinedorrelax{date#1}{%
\PackageWarningNoLine{scrdate}
{\protect\date#1\space not defined.\MessageBreak
\protect\todaysname maybe can't use
- \protect\dayname@#1!}
- \else
+ \protect\dayname@#1!}%
+ }{%
\expandafter\let\csname D@date#1\expandafter\endcsname
\csname date#1\endcsname
\@namedef{date#1}{%
@@ -115,15 +162,15 @@
\@ifundefined{languagename}{
\scrdate@languagenamewarning
\ifnum\language=\@nameuse{l@#1}
- \@nameuse{date#1}
- \fi}{
- \@ifundefined{date\languagename}
- {}
- {\@nameuse{date\languagename}}
- }
- \fi
- }
- \fi
+ \@nameuse{date#1}%
+ \fi}{%
+ \@ifundefined{date\languagename}%
+ {}%
+ {\@nameuse{date\languagename}}%
+ }%
+ }%
+ }%
+ }%
}
\newdaylanguage{german}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
@@ -148,11 +195,9 @@
\newdaylanguage{norsk}{Mandag}{Tirsdag}{Onsdag}
{Torsdag}{Fredag}{L\o{}rdag}{S\o{}ndag}
\def\@dayname#1{%
- \begingroup%
- \@tempcnta #1%
- \ifcase\@tempcnta%
- Monday\or Tuesday\or Wednesday\or Thursday\or
- Friday\or Saturday\or Sunday\fi\endgroup%
+ \ifcase #1
+ Monday\or Tuesday\or Wednesday\or Thursday\or
+ Friday\or Saturday\or Sunday\fi%
}
\InputIfFileExists{scrdate.cfg}
{\typeout{*************************************^^J%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index f16f5741f0e..a7126d3bace 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -117,7 +117,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
@@ -212,8 +212,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{10}
\@namedef{scr@v@3.04a}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.05a}{10}
+\@namedef{scr@v@3.06}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -623,109 +625,6 @@
\setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
}%
}
-\newcommand*{\setkomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \PackageError{scrextend}{%
- font of element `#1' can't be set}{%
- You've told me to redefine the font selection of the
- element,\MessageBreak%
- but either no such element is known by
- KOMA-Script\MessageBreak%
- or the element does not use a special font selection%
- }%
- }{%
- \PackageInfo{scrextend}{%
- You've told me to redefine the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\setkomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \PackageWarning{scrextend}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\addtokomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \PackageError{scrextend}{%
- font of element `#1' can't be extended%
- }{%
- You've told me to extend the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \PackageInfo{scrextend}{%
- You've told me to extend the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\addtokomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\l@addto@macro
- \csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \PackageWarning{scrextend}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\usekomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \PackageError{scrextend}{%
- font of element `#1' can't be used%
- }{%
- You've told me to use the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \PackageInfo{scrextend}{%
- You've told me to use the font selection of the
- element\MessageBreak
- `#1' that is an alias of element `\csname
- scr@fnt@instead@#1\endcsname'\MessageBreak
- }%
- \expandafter\expandafter\expandafter\usekomafont
- \expandafter\expandafter\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}%
- }%
- }{%
- \@nameuse{scr@fnt@#1}%
- }%
-}
-\newcommand*{\newkomafont}[3][\relax]{%
- \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
- \expandafter\expandafter\expandafter\newcommand
- \expandafter\expandafter\expandafter*%
- \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
- \csname @#2font\endcsname%
- }%
- \ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
- \fi
-}
-\newcommand*{\aliaskomafont}[2]{%
- \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
- #2%
- }%
-}
%%% From File: scrktitl.dtx
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
@@ -1020,6 +919,49 @@
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
%%% From File: scrkftn.dtx
+\newcommand*{\ftn@rule@test@values}{%
+ \ifdim\ftn@rule@height <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ less than 0%
+ }%
+ \else
+ \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ greater than \the\dimexpr\skip\footins -2.6\p@\relax
+ }%
+ \fi
+ \fi
+ \ifdim\ftn@rule@width <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ less than 0pt%
+ }%
+ \else
+ \ifdim\ftn@rule@width >\columnwidth
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ greater than \string\columnwidth
+ }%
+ \fi
+ \fi
+}
+\newcommand*{\ftn@rule@width}{.4\columnwidth}
+\newcommand*{\ftn@rule@height}{.4\p@}
+\newcommand*{\setfootnoterule}[2][]{%
+ \ifstr{#1}{}{}{%
+ \renewcommand*{\ftn@rule@height}{#1}%
+ }%
+ \ifstr{#2}{}{}{%
+ \renewcommand*{\ftn@rule@width}{#2}%
+ }%
+ \ftn@rule@test@values
+}
\newcommand\deffootnote[4][]{%
\long\def\@makefntext##1{%
\setlength{\@tempdimc}{#3}%
@@ -1140,7 +1082,7 @@
\setlength{\itemindent}{\z@}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
- \setlength{\partopsep}{\parskip}%
+ \setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 126b5d382c4..548453ff17c 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
%%% From File: scrhack.dtx
%%% using: package,identify
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index 4d686e1e5fb..d0910e57f80 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -41,7 +41,7 @@
%%% From File: scrjura.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}
- [2009/03/24 v0.5a beta
+ [2010/06/07 v0.5d KOMA-Script for jurists
(package)%
]
\@ifpackageloaded{hyperref}{%
@@ -58,6 +58,7 @@
\g@addto@macro\document\contract%
}
\KOMA@ifkey{juratotoc}{@juratotoc}
+\KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak}
\newcommand*{\Paragraphmark}[1]{}
\KOMA@key{paragraphmark}{%
\begingroup
@@ -98,12 +99,15 @@
{parlong}{1},{longpar}{1},{ParL}{1},%
{parshort}{2},{shortpar}{2},{ParS}{2},%
{parnumeric}{3},{numericpar}{3},{ParN}{3},%
+ {paroff}{4},{nopar}{4},%
{sentencelong}{10},{longsentence}{10},{SentenceL}{10},%
{sentenceshort}{20},{shortsentence}{20},{SentenceS}{20},%
{sentencenumeric}{30},{numericsentence}{30},{SentenceN}{30},%
+ {sentenceoff}{40},{nosentence}{40},%
{long}{11},%
{short}{22},%
- {numeric}{33}%
+ {numeric}{33},%
+ {paragraphonly}{44},{ParagraphOnly}{44},{OnlyParagraph}{44}%
}{#1}%
\@tempcnta=\@tempa\relax
\@tempcntb=\z@
@@ -121,6 +125,9 @@
\or
\aftergroup\def\aftergroup\parcite@format
\aftergroup{\aftergroup2\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup-\aftergroup1\aftergroup}%
\fi
\ifcase \@tempcntb
\or
@@ -132,25 +139,34 @@
\or
\aftergroup\def\aftergroup\sentencecite@format
\aftergroup{\aftergroup2\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup-\aftergroup1\aftergroup}%
\fi
\endgroup
}
\KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
\KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
\KOMAProcessOptions\relax
+\newcommand*{\jura@env@type}{}
\newcommand*{\contract}{%
- \renewcommand*{\contract}{%
- \contract@nest@error{contract}%
- }%
- \let\@doendpe\contract@doendpe
- \let\Paragraph\contract@paragraph
- \let\c@Paragraph\c@contractParagraph
- \edef\cl@Paragraph{\cl@Paragraph\cl@contractParagraph}%
- \let\SubParagraph\contract@subparagraph
- \let\c@SubParagraph\c@contractSubParagraph
- \edef\cl@SubParagraph{\cl@SubParagraph\cl@contractSubParagraph}%
- \let\Par\contract@everypar
- \let\Sentence\contract@sentence
+ \ifx\jura@env@type\@empty
+ \let\@doendpe\contract@doendpe
+ \let\Paragraph\contract@paragraph
+ \let\c@Paragraph\c@contractParagraph
+ \edef\cl@Paragraph{\cl@Paragraph\cl@contractParagraph}%
+ \let\SubParagraph\contract@subparagraph
+ \let\c@SubParagraph\c@contractSubParagraph
+ \edef\cl@SubParagraph{\cl@SubParagraph\cl@contractSubParagraph}%
+ \let\Par\contract@everypar
+ \let\Sentence\contract@sentence
+ \renewcommand*{\jura@env@type}{contract}%
+ \else
+ \PackageError{contract}{nested `contract' detected}{%
+ You may not use a `contract' environment inside\MessageBreak
+ a `\jura@env@type' environment or after loading\MessageBreak
+ package `scrjura' with option `\jura@env@type'!}%
+ \fi
}
\let\if@jura@skiphyperref\iftrue
\let\cl@Paragraph\@empty
@@ -223,22 +239,23 @@
\let\theSubParagraph\theParagraph
\ifcontract@dummy\else
\begingroup
+ \if@juratitlepagebreak\else\interlinepenalty\@M\fi
\contract@paragraph@font \theParagraph
\ifx\contract@title\relax\else\enskip\contract@title\fi
- \endgroup
- \ifx\contract@entry\relax\else
- \addcontentsline{toc}{cpar}{%
- \protect\numberline{\theParagraph}\contract@entry
- }%
- \addcontentsline{cpa}{cpar}{%
- \protect\numberline{\theParagraph}\contract@entry
- }%
- \fi
- \ifx\contract@head\relax\else
- \expandafter\Paragraphmark\expandafter{%
- \expandafter\theSubParagraph\expandafter\enskip\contract@head}%
- \fi
- \par\nobreak\vskip\contract@postskip
+ \ifx\contract@entry\relax\else
+ \addcontentsline{toc}{cpar}{%
+ \protect\numberline{\theParagraph}\contract@entry
+ }%
+ \addcontentsline{cpa}{cpar}{%
+ \protect\numberline{\theParagraph}\contract@entry
+ }%
+ \fi
+ \ifx\contract@head\relax\else
+ \expandafter\Paragraphmark\expandafter{%
+ \expandafter\theSubParagraph\expandafter\enskip\contract@head}%
+ \fi
+ \par
+ \endgroup\nobreak\vskip\contract@postskip
\jura@afterheading{contract}%
\fi
}
@@ -279,22 +296,24 @@
\fi
\ifcontract@dummy\else
\begingroup
+ \if@juratitlepagebreak\else\interlinepenalty\@M\fi
\contract@paragraph@font \theSubParagraph
\ifx\contract@title\relax\else\enskip\contract@title\fi
+ \ifx\contract@entry\relax\else
+ \addcontentsline{toc}{cpar}{%
+ \protect\numberline{\theSubParagraph}\contract@entry
+ }%
+ \addcontentsline{cpa}{cpar}{%
+ \protect\numberline{\theSubParagraph}\contract@entry
+ }%
+ \fi
+ \ifx\contract@head\relax\else
+ \expandafter\Paragraphmark\expandafter{%
+ \expandafter\theSubParagraph\expandafter\enskip\contract@head}%
+ \fi
+ \par
\endgroup
- \ifx\contract@entry\relax\else
- \addcontentsline{toc}{cpar}{%
- \protect\numberline{\theSubParagraph}\contract@entry
- }%
- \addcontentsline{cpa}{cpar}{%
- \protect\numberline{\theSubParagraph}\contract@entry
- }%
- \fi
- \ifx\contract@head\relax\else
- \expandafter\Paragraphmark\expandafter{%
- \expandafter\theSubParagraph\expandafter\enskip\contract@head}%
- \fi
- \par\nobreak\vskip\contract@postskip
+ \nobreak\vskip\contract@postskip
\jura@afterheading{contract}%
\fi
}
@@ -352,12 +371,14 @@
\newcounter{juratoclevel}
\setcounter{juratoclevel}{2}%
\DeclareRobustCommand*{\jura@separator}[1]{#1}
+\DeclareRobustCommand*{\jura@usetype}[1]{\jura@@usetype{#1}}
+\newcommand*{\jura@@usetype}[1]{}
\newif\ifparnumber
\newcounter{par}
\renewcommand*{\thepar}{\arabic{par}}
\newcommand*{\theHpar}{\theH@AbsParagraph-\Roman{par}}
\newcommand*{\parformat}{(\thepar)}
-\renewcommand*\p@par{{\theSubParagraph\jura@separator{\nobreakspace}}}
+\renewcommand*\p@par{{\jura@usetype{\jura@env@type}\theSubParagraph\jura@separator{\nobreakspace}}}
\@addtoreset{par}{Paragraph}
\@addtoreset{par}{SubParagraph}
\newcommand*{\contract@everypar}{%
@@ -365,9 +386,9 @@
\refstepcounter{par}%
\refstepcounter{sentence}%
\begingroup
- \protected@write\@auxout{}{%
- \string\newmaxpar{contractpars}{\theSubParagraph}{\arabic{par}}}%
- \getmaxpar\@tempa{contractpars}{\theSubParagraph}%
+ \protected@write\@auxout{\let\contract@Paragraphformat\@firstofone}{%
+ \string\newmaxpar{contract}{\theSubParagraph}{\arabic{par}}}%
+ \getmaxpar\@tempa{contract}{\theSubParagraph}%
\typeout{Stored max is \@tempa}%
\ifnum \@tempa>\@ne
\parformat\nobreakspace
@@ -568,22 +589,28 @@
\DeclareRobustCommand*{\par@cite}[1]{\parciteformat{#1}}
\newcommand*{\parciteformat}[1]{%
\ifcase \parcite@format
- \parlongformat{#1}%
+ \expandafter\parlongformat
\or
- \parshortformat{#1}%
+ \expandafter\parshortformat
\or
- \parnumericformat{#1}%
+ \expandafter\parnumericformat
+ \else
+ \unskip\expandafter\@gobble
\fi
+ {#1}%
}
\DeclareRobustCommand*{\sentence@cite}[1]{\sentenceciteformat{#1}}
\newcommand*{\sentenceciteformat}[1]{%
\ifcase \sentencecite@format
- \sentencelongformat{#1}%
+ \expandafter\sentencelongformat
\or
- \sentenceshortformat{#1}%
+ \expandafter\sentenceshortformat
\or
- \sentencenumericformat{#1}%
+ \expandafter\sentencenumericformat
+ \else
+ \unskip\expandafter\@gobble
\fi
+ {#1}%
}
\newcommand*{\parlongformat}[1]{\parname~#1}
\newcommand*{\parshortformat}[1]{\parshortname~#1}
@@ -628,7 +655,8 @@
}
\newcommand*{\getmaxpar}[3]{%
\begingroup
- \protected@edef\@tempa{#3}%
+ \expandafter\let\csname #2@Paragraphformat\endcsname\@firstofone
+ \edef\@tempa{#3}%
\@onelevel@sanitize\@tempa
\expandafter\ifx \csname max@#2@\@tempa\endcsname\relax
\edef\@tempa{\endgroup\edef\noexpand#1{\expandafter\the\value{par}}}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 321001e1aea..8d0b1caa6c4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -6,8 +6,10 @@
%%
%% scrkvers.dtx (with options: `package,scrkbase')
%% scrkbase.dtx (with options: `package,option,koma')
+%% scrkfont.dtx (with options: `package,option,scrkbase')
%% scrlfile.dtx (with options: `load')
%% scrkbase.dtx (with options: `package,body,koma')
+%% scrkfont.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2010
@@ -65,7 +67,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -81,6 +83,7 @@
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
\KOMAProcessOptions\relax
+%%% From File: scrkfont.dtx
%%% From File: scrlfile.dtx
\def\scrlfileversion{2009/03/25 v3.03}
\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
@@ -245,6 +248,110 @@
}%
\KOMAoptions{#3}%
}
+%%% From File: scrkfont.dtx
+\newcommand*{\setkomafont}[2]{%
+ \@ifundefined{scr@fnt@#1}{%
+ \@ifundefined{scr@fnt@instead@#1}{%
+ \PackageError{scrkbase}{%
+ font of element `#1' can't be set}{%
+ You've told me to redefine the font selection of the
+ element,\MessageBreak%
+ but either no such element is known by
+ KOMA-Script\MessageBreak%
+ or the element does not use a special font selection%
+ }%
+ }{%
+ \PackageInfo{scrkbase}{%
+ You've told me to redefine the font selection of the\MessageBreak
+ element `#1' that is an alias of element\MessageBreak
+ `\csname scr@fnt@instead@#1\endcsname'%
+ }%
+ \expandafter\setkomafont\expandafter{%
+ \csname scr@fnt@instead@#1\endcsname}{#2}%
+ }%
+ }{%
+ \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
+ }%
+ \@ifundefined{scr@fnt@wrn@#1}{}{%
+ \PackageWarning{scrkbase}{%
+ \csname scr@fnt@wrn@#1\endcsname{#1}%
+ }%
+ }%
+}
+\newcommand*{\addtokomafont}[2]{%
+ \@ifundefined{scr@fnt@#1}{%
+ \@ifundefined{scr@fnt@instead@#1}{%
+ \PackageError{scrkbase}{%
+ font of element `#1' can't be extended%
+ }{%
+ You've told me to extend the font selection of the
+ element,\MessageBreak
+ but either no such element is known by
+ KOMA-Script\MessageBreak
+ or the element does not use a special font selection%
+ }%
+ }{%
+ \PackageInfo{scrkbase}{%
+ You've told me to extend the font selection of the\MessageBreak
+ element `#1' that is an alias of element\MessageBreak
+ `\csname scr@fnt@instead@#1\endcsname'%
+ }%
+ \expandafter\addtokomafont\expandafter{%
+ \csname scr@fnt@instead@#1\endcsname}{#2}%
+ }%
+ }{%
+ \expandafter\expandafter\expandafter\l@addto@macro
+ \csname scr@fnt@#1\endcsname{#2}%
+ }%
+ \@ifundefined{scr@fnt@wrn@#1}{}{%
+ \PackageWarning{scrkbase}{%
+ \csname scr@fnt@wrn@#1\endcsname{#1}%
+ }%
+ }%
+}
+\newcommand*{\usekomafont}[1]{%
+ \@ifundefined{scr@fnt@#1}{%
+ \@ifundefined{scr@fnt@instead@#1}{%
+ \PackageError{scrkbase}{%
+ font of element `#1' can't be used%
+ }{%
+ You've told me to use the font selection of the
+ element,\MessageBreak
+ but either no such element is known by
+ KOMA-Script\MessageBreak
+ or the element does not use a special font selection%
+ }%
+ }{%
+ \PackageInfo{scrkbase}{%
+ You've told me to use the font selection of the
+ element\MessageBreak
+ `#1' that is an alias of element `\csname
+ scr@fnt@instead@#1\endcsname'\MessageBreak
+ }%
+ \expandafter\expandafter\expandafter\usekomafont
+ \expandafter\expandafter\expandafter{%
+ \csname scr@fnt@instead@#1\endcsname}%
+ }%
+ }{%
+ \@nameuse{scr@fnt@#1}%
+ }%
+}
+\newcommand*{\newkomafont}[3][\relax]{%
+ \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
+ \expandafter\expandafter\expandafter\newcommand
+ \expandafter\expandafter\expandafter*%
+ \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
+ \csname @#2font\endcsname%
+ }%
+ \ifx\relax#1\relax\else
+ \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
+ \fi
+}
+\newcommand*{\aliaskomafont}[2]{%
+ \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
+ #2%
+ }%
+}
%%% From File: scrlogo.dtx
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 06a044d4221..461103c27ce 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -167,8 +167,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{10}
\@namedef{scr@v@3.04a}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.05a}{10}
+\@namedef{scr@v@3.06}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -1141,109 +1143,6 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-\newcommand*{\setkomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be set}{%
- You've told me to redefine the font selection of the
- element,\MessageBreak%
- but either no such element is known by
- KOMA-Script\MessageBreak%
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to redefine the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\setkomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\addtokomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be extended%
- }{%
- You've told me to extend the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to extend the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\addtokomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\l@addto@macro
- \csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\usekomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be used%
- }{%
- You've told me to use the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to use the font selection of the
- element\MessageBreak
- `#1' that is an alias of element `\csname
- scr@fnt@instead@#1\endcsname'\MessageBreak
- }%
- \expandafter\expandafter\expandafter\usekomafont
- \expandafter\expandafter\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}%
- }%
- }{%
- \@nameuse{scr@fnt@#1}%
- }%
-}
-\newcommand*{\newkomafont}[3][\relax]{%
- \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
- \expandafter\expandafter\expandafter\newcommand
- \expandafter\expandafter\expandafter*%
- \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
- \csname @#2font\endcsname%
- }%
- \ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
- \fi
-}
-\newcommand*{\aliaskomafont}[2]{%
- \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
- #2%
- }%
-}
%%% From File: scrkmisc.dtx
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -2177,10 +2076,54 @@
}
%%% From File: scrkftn.dtx
\renewcommand*\footnoterule{%
- \kern-3\p@
+ \normalsize\ftn@rule@test@values
+ \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
\ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
- \hrule\@width.4\columnwidth
+ \hrule \@height\ftn@rule@height \@width\ftn@rule@width
\kern 2.6\p@}
+\newcommand*{\ftn@rule@test@values}{%
+ \ifdim\ftn@rule@height <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ less than 0%
+ }%
+ \else
+ \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ greater than \the\dimexpr\skip\footins -2.6\p@\relax
+ }%
+ \fi
+ \fi
+ \ifdim\ftn@rule@width <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ less than 0pt%
+ }%
+ \else
+ \ifdim\ftn@rule@width >\columnwidth
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ greater than \string\columnwidth
+ }%
+ \fi
+ \fi
+}
+\newcommand*{\ftn@rule@width}{.4\columnwidth}
+\newcommand*{\ftn@rule@height}{.4\p@}
+\newcommand*{\setfootnoterule}[2][]{%
+ \ifstr{#1}{}{}{%
+ \renewcommand*{\ftn@rule@height}{#1}%
+ }%
+ \ifstr{#2}{}{}{%
+ \renewcommand*{\ftn@rule@width}{#2}%
+ }%
+ \ftn@rule@test@values
+}
\newcommand\deffootnote[4][]{%
\long\def\@makefntext##1{%
\setlength{\@tempdimc}{#3}%
@@ -2373,7 +2316,7 @@
\setlength{\itemindent}{\z@}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
- \setlength{\partopsep}{\parskip}%
+ \setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
index e9c08b4eb38..396661cc31f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
@@ -203,6 +203,7 @@ headinclude,footinclude%
\headfont\footfont\strut #5}}
\botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
}
+
\newcommand\topfoot@rule[2]{%
\@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip
\advance\@tempdima by -#2
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 793b8999d96..cbb80421476 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -43,7 +43,7 @@
%%% From File: scrpage.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}
- [2009/11/11 v2.4 LaTeX2e KOMA-Script
+ [2010/04/22 v2.5 LaTeX2e KOMA-Script
package]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
@@ -179,129 +179,78 @@
\@ifstar
{\@defpagestyle[-]}%
{\@defpagestyle[+]}}
-\if@twoside
- \def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \def@twosidehead#3
- \def@twosidefoot#4
- }
- }
-\else
- \def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \def@onesidehead#3
- \def@onesidefoot#4
- }
- }
-\fi
-\def\def@twosidehead{%
- \@ifnextchar(%)
- {\def@@twosidehead}%
- {\def@@twosidehead(\scr@headabove@linelength,%
- \scr@headabove@linethickness)}}
-\def\def@@twosidehead(#1,#2)#3#4#5{%
- \@ifnextchar(%)
- {\def@@@twosidehead({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@twosidehead({#1},{#2}){#3}{#4}{#5}%
- (\scr@headbelow@linelength,%
- \scr@headbelow@linethickness)}}
-\def\def@@@twosidehead(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{\let\headmark\leftmark%
- \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
- \hf@rule{#1}{#2}{\@headwidth}%
- {headabove}%
- \vskip#2
- \vskip\baselineskip
- \hb@xt@\@headwidth{{%
- \scr@nouppercase
- \headfont\strut #3}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- {headbelow}%
- }\hskip\@oddheadshift\hss}%
- \def\@oddhead{\let\headmark\rightmark
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf@rule{#1}{#2}{\@headwidth}%
- {headabove}%
- \vskip#2%
- \vskip\baselineskip
- \hb@xt@\@headwidth{{%
- \scr@nouppercase
- \headfont\strut #4}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- {headbelow}%
- }\hskip\@evenheadshift\hss}%
+\def\@defpagestyle[#1]#2#3#4{%
+ \expandafter\def\csname ps@#2\endcsname{%
+ \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
+ \def@head#3
+ \def@foot#4
+ }%
}
-\def\def@onesidehead{%
+
+\def\def@head{%
\@ifnextchar(%)
- {\def@@onesidehead}%
- {\def@@onesidehead(\scr@headabove@linelength,%
- \scr@headabove@linethickness)}}
-\def\def@@onesidehead(#1,#2)#3#4#5{%
+ {\def@@head}%
+ {\def@@head(\scr@headabove@linelength,%
+ \scr@headabove@linethickness)}}
+\def\def@@head(#1,#2)#3#4#5{%
\@ifnextchar(%)
- {\def@@@onesidehead({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@onesidehead({#1},{#2}){#3}{#4}{#5}%
- (\scr@headbelow@linelength,%
- \scr@headbelow@linethickness)}}
-\def\def@@@onesidehead(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{}%
+ {\def@@@head({#1},{#2}){#3}{#4}{#5}}%
+ {\def@@@head({#1},{#2}){#3}{#4}{#5}%
+ (\scr@headbelow@linelength,%
+ \scr@headbelow@linethickness)}}
+\def\def@@@head(#1,#2)#3#4#5(#6,#7){%
+ \def\@evenhead{%
+ \if@twoside
+ \let\headmark\leftmark%
+ \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
+ \hf@rule{#1}{#2}{\@headwidth}{headabove}%
+ \vskip#2
+ \vskip\baselineskip
+ \hb@xt@\@headwidth{{%
+ \scr@nouppercase
+ \headfont\strut #3}}%
+ \hf@rule{#6}{#7}{\@headwidth}{headbelow}%
+ }\hskip\@oddheadshift\hss
+ \fi
+ }%
\def\@oddhead{\let\headmark\rightmark
\hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf@rule{#1}{#2}{\@headwidth}%
- {headabove}%
+ \hf@rule{#1}{#2}{\@headwidth}{headabove}%
\vskip#2%
\vskip\baselineskip
\hb@xt@\@headwidth{{%
\scr@nouppercase
- \headfont\strut #5}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- {headbelow}%
+ \headfont\strut \if@twoside #4\else #5\fi}}%
+ \hf@rule{#6}{#7}{\@headwidth}{headbelow}%
}\hskip\@evenheadshift\hss}%
}
-\def\def@twosidefoot{%
- \@ifnextchar(%)
- {\def@@twosidefoot}
- {\def@@twosidefoot(\scr@footabove@linelength,%
- \scr@footabove@linethickness)}}
-\def\def@@twosidefoot(#1,#2)#3#4#5{%
- \@ifnextchar(%)
- {\def@@@twosidefoot({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@twosidefoot({#1},{#2}){#3}{#4}{#5}%
- (\scr@footbelow@linelength,%
- \scr@footbelow@linethickness)}}
-\def\def@@@twosidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{\let\headmark\leftmark
- \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \scr@nouppercase
- \headfont\footfont\strut #3}}%
- \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss}%
- \def\@oddfoot{\let\headmark\rightmark
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \scr@nouppercase
- \headfont\footfont\strut #4}}%
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
-}
-\def\def@onesidefoot{%
+\def\def@foot{%
\@ifnextchar(%)
- {\def@@onesidefoot}%
- {\def@@onesidefoot(\scr@footabove@linelength,%
+ {\def@@foot}
+ {\def@@foot(\scr@footabove@linelength,%
\scr@footabove@linethickness)}}
-\def\def@@onesidefoot(#1,#2)#3#4#5{%
+\def\def@@foot(#1,#2)#3#4#5{%
\@ifnextchar(%)
- {\def@@@onesidefoot({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@onesidefoot({#1},{#2}){#3}{#4}{#5}%
+ {\def@@@foot({#1},{#2}){#3}{#4}{#5}}%
+ {\def@@@foot({#1},{#2}){#3}{#4}{#5}%
(\scr@footbelow@linelength,%
\scr@footbelow@linethickness)}}
-\def\def@@@onesidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{}%
+\def\def@@@foot(#1,#2)#3#4#5(#6,#7){%
+ \def\@evenfoot{%
+ \if@twoside
+ \let\headmark\leftmark
+ \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
+ \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
+ \scr@nouppercase
+ \headfont\footfont\strut #3}}%
+ \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss
+ \fi
+ }%
\def\@oddfoot{\let\headmark\rightmark
\hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
\scr@nouppercase
- \headfont\footfont\strut #5}}
+ \headfont\footfont\strut \if@twoside #4\else #5\fi}}%
\botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
}
\newcommand\topfoot@rule[2]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index f3caa549ba5..07384c5c051 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2010/01/05 v3.04b}
+\def\tocbasicversion{2010/06/09 v3.06}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -177,8 +177,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{10}
\@namedef{scr@v@3.04a}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.05a}{10}
+\@namedef{scr@v@3.06}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -827,10 +829,11 @@
{flat}{3},{left}{3},%
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
- {chapterentry}{6},{withchapterentry}{6},%
- {nochaptergap}{7},{ignorechapter}{7},%
- {chaptergapsmall}{8},{smallchaptergap}{8},%
- {chaptergapline}{9},{onelinechaptergap}{9}%
+ {entryprefix}{6},
+ {chapterentry}{7},{withchapterentry}{7},%
+ {nochaptergap}{8},{ignorechapter}{8},%
+ {chaptergapsmall}{9},{smallchaptergap}{9},%
+ {chaptergapline}{10},{onelinechaptergap}{10}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*{\float@@listhead}{%
@@ -840,6 +843,10 @@
\unsettoc{\@currext}{numbered}%
\unsettoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
\or% totoc
\renewcommand*{\float@@listhead}{%
\addchap
@@ -848,6 +855,10 @@
\unsettoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% numbered
\renewcommand*{\float@@listhead}{%
\chapter
@@ -856,6 +867,10 @@
\setuptoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% flat
\@dynlisttrue
\or% graduated
@@ -864,6 +879,29 @@
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
\or% chapterentry
\KOMA@options{chapteratlists=entry}{}%
\or% chaptergap
@@ -1280,109 +1318,6 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-\newcommand*{\setkomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be set}{%
- You've told me to redefine the font selection of the
- element,\MessageBreak%
- but either no such element is known by
- KOMA-Script\MessageBreak%
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to redefine the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\setkomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\addtokomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be extended%
- }{%
- You've told me to extend the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to extend the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\addtokomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\l@addto@macro
- \csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\usekomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be used%
- }{%
- You've told me to use the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to use the font selection of the
- element\MessageBreak
- `#1' that is an alias of element `\csname
- scr@fnt@instead@#1\endcsname'\MessageBreak
- }%
- \expandafter\expandafter\expandafter\usekomafont
- \expandafter\expandafter\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}%
- }%
- }{%
- \@nameuse{scr@fnt@#1}%
- }%
-}
-\newcommand*{\newkomafont}[3][\relax]{%
- \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
- \expandafter\expandafter\expandafter\newcommand
- \expandafter\expandafter\expandafter*%
- \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
- \csname @#2font\endcsname%
- }%
- \ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
- \fi
-}
-\newcommand*{\aliaskomafont}[2]{%
- \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
- #2%
- }%
-}
%%% From File: scrklang.dtx
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -1979,8 +1914,6 @@
\@afterindentfalse
\secdef\@chapter\@schapter
}
-\setuptoc{lof}{chapteratlist}
-\setuptoc{lot}{chapteratlist}
\newcommand*{\@chapter}{}
\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
\refstepcounter{chapter}%
@@ -2204,9 +2137,9 @@
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
-\newkomafont{partentry}{\usekomafont{sectioning}\large}
+\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
-\newkomafont{chapterentry}{\usekomafont{sectioning}}
+\newkomafont{chapterentry}{\usekomafont{disposition}}
\newkomafont{chapterentrypagenumber}{}
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
@@ -3129,10 +3062,54 @@
}
%%% From File: scrkftn.dtx
\renewcommand*\footnoterule{%
- \kern-3\p@
+ \normalsize\ftn@rule@test@values
+ \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
\ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
- \hrule\@width.4\columnwidth
+ \hrule \@height\ftn@rule@height \@width\ftn@rule@width
\kern 2.6\p@}
+\newcommand*{\ftn@rule@test@values}{%
+ \ifdim\ftn@rule@height <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ less than 0%
+ }%
+ \else
+ \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ greater than \the\dimexpr\skip\footins -2.6\p@\relax
+ }%
+ \fi
+ \fi
+ \ifdim\ftn@rule@width <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ less than 0pt%
+ }%
+ \else
+ \ifdim\ftn@rule@width >\columnwidth
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ greater than \string\columnwidth
+ }%
+ \fi
+ \fi
+}
+\newcommand*{\ftn@rule@width}{.4\columnwidth}
+\newcommand*{\ftn@rule@height}{.4\p@}
+\newcommand*{\setfootnoterule}[2][]{%
+ \ifstr{#1}{}{}{%
+ \renewcommand*{\ftn@rule@height}{#1}%
+ }%
+ \ifstr{#2}{}{}{%
+ \renewcommand*{\ftn@rule@width}{#2}%
+ }%
+ \ftn@rule@test@values
+}
\@addtoreset{footnote}{chapter}
\newcommand\deffootnote[4][]{%
\long\def\@makefntext##1{%
@@ -3210,13 +3187,25 @@
\@footnotemark
}
%%% From File: scrkliof.dtx
+\doforeachtocfile[float]{%
+ \setuptoc{\@currext}{chapteratlist}%
+}
+\AtAddToTocList[float]{%
+ \setuptoc{\@currext}{chapteratlist}%
+}
\renewcommand*{\numberline}[1]{%
- \hb@xt@\@tempdima{#1\autodot\hfil}}
+ \numberline@box{%
+ \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ }%
+}
+\newcommand*{\numberline@prefix}{}
+\newcommand*{\numberline@postfix}{\hfil}
+\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
\newcommand*\@dotsep{4.5}
\newcommand*{\scr@dottedtocline}{}
-\newcommand*{\scr@numberline}{}
\newcommand*{\last@l@number}{}
\newcommand*{\@l@number}{}
\newcommand*{\set@l@number}[1]{%
@@ -3227,14 +3216,13 @@
\ifdim\@tempdima >\last@l@number \else
\setlength{\@tempdima}{\last@l@number}%
\fi%
- }
+}
\newcommand*{\before@starttoc}[1]{
\let\scr@dottedtocline=\@dottedtocline
\renewcommand*{\@dottedtocline}[3]{%
\scr@dottedtocline{##1}{\z@}{\last@l@number}}%
- \let\scr@numberline=\numberline
- \renewcommand*{\numberline}[1]{%
- \set@l@number{##1}\scr@numberline{##1}}%
+ \renewcommand*{\numberline@box}[1]{%
+ \set@l@number{##1}\hb@xt@\@tempdima{##1}}%
\gdef\@l@number{\z@}%
\@ifundefined{#1@l@number}{%
\def\last@l@number{2em}%
@@ -3310,8 +3298,10 @@
}
\newcommand*\listfigurename{List of Figures}
\newcommand*\listoflofname{\listfigurename}
+\newcommand*\listoflofentryname{\figurename}
\newcommand*\listtablename{List of Tables}
\newcommand*\listoflotname{\listtablename}
+\newcommand*\listoflotentryname{\tablename}
\newcommand*\listoffigures{\listoftoc{lof}}
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
@@ -3560,7 +3550,7 @@
\setlength{\itemindent}{\z@}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
- \setlength{\partopsep}{\parskip}%
+ \setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index e33d1df35c5..576ba95dcee 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 417b9798858..5116d36a000 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 548d6211541..40a8d0f67d6 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 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 33fa468a96f..fc1c09987dc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -4,7 +4,11 @@
%%
%% The original source files were:
%%
-%% scrtime.dtx (with options: `scrtime')
+%% scrkvers.dtx (with options: `package,scrtime')
+%% scrtime.dtx (with options: `package,scrtime,identify')
+%% scrkbase.dtx (with options: `load')
+%% scrtime.dtx (with options: `package,scrtime,option')
+%% scrtime.dtx (with options: `package,scrtime,body')
%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2010
@@ -40,16 +44,43 @@
%% 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{2010/06/17 v3.06 KOMA-Script}%
+\endgroup
%%% From File: scrtime.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{scrtime}
- [2009/01/01 v1.1p LaTeX2e KOMA-Script
- package]
+\ProvidesPackage{scrtime}[%
+ \KOMAScriptVersion\space package (%
+ time of LaTeX run)]
+%%% From File: scrkbase.dtx
+\RequirePackage{scrkbase}[\KOMAScriptVersion]
+%%% From File: scrtime.dtx
\newif\if@Hxii
-\DeclareOption{12h}{\@Hxiitrue}
-\DeclareOption{24h}{\@Hxiifalse}
-\ExecuteOptions{24h}
-\ProcessOptions
+\KOMA@ifkey{12h}{@Hxii}
+\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}
+\KOMAProcessOptions\relax
+%%% From File: scrtime.dtx
\def\thistime{%
\@ifstar
{\let\@tempif\iffalse\@thistime}
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 0a68e5881b1..151f251a7c5 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -39,12 +39,14 @@
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2010/01/05 v3.04b}
+\def\tocbasicversion{2010/06/09 v3.06}
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocbasic}
[\tocbasicversion\space KOMA-Script package
(handling toc-files)%
]
+\ProcessOptions\relax
+\RequirePackage{keyval}
\newcommand*{\tb@listoftocs}{}
\newcommand{\ifattoclist}[1]{%
\begingroup
@@ -238,7 +240,7 @@
\ifx\relax#1\relax
\g@addto@macro\tocbasic@@before@hook{#2}%
\else
- \scr@ifundefinedorrelax{tb@#1@before@hook}{%
+ \@ifundefined{tb@#1@before@hook}{%
\PackageInfo{tocbasic}{defining new hook before starting `#1'}%
\expandafter\global\expandafter\let\csname tb@#1@before@hook\endcsname
\@empty
@@ -250,7 +252,7 @@
\ifx\relax#1\relax
\g@addto@macro\tocbasic@@after@hook{#2}%
\else
- \scr@ifundefinedorrelax{tb@#1@after@hook}{%
+ \@ifundefined{tb@#1@after@hook}{%
\PackageInfo{tocbasic}{defining new hook after starting `#1'}%
\expandafter\global\expandafter\let\csname tb@#1@after@hook\endcsname
\@empty
@@ -286,6 +288,14 @@
}%
}{}%
\tocbasic@listhead{#1}%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname microtypesetup\endcsname\relax
+ \else
+ \iftocfeature{\@currext}{noprotrusion}{}{%
+ \microtypesetup{protrusion=false}%
+ \PackageInfo{tocbasic}{character protrusion at \@currext\space deactivated}%
+ }%
+ \fi
\tocbasic@starttoc{#2}%
\endgroup
}
@@ -360,7 +370,7 @@
\csname tb@@afterhead@hook\endcsname
}
\newcommand{\BeforeTOCHead}[2][]{%
- \scr@ifundefinedorrelax{tb@#1@beforehead@hook}{%
+ \@ifundefined{tb@#1@beforehead@hook}{%
\PackageInfo{tocbasic}{defining new hook before heading of `#1'}%
\expandafter\global\expandafter\let\csname tb@#1@beforehead@hook\endcsname
\@empty
@@ -368,7 +378,7 @@
\expandafter\g@addto@macro\csname tb@#1@beforehead@hook\endcsname{#2}%
}
\newcommand{\AfterTOCHead}[2][]{%
- \scr@ifundefinedorrelax{tb@#1@afterhead@hook}{%
+ \@ifundefined{tb@#1@afterhead@hook}{%
\PackageInfo{tocbasic}{defining new hook after heading of `#1'}%
\expandafter\global\expandafter\let\csname tb@#1@afterhead@hook\endcsname
\@empty
@@ -432,6 +442,205 @@
}%
}%
}
+\define@key{tocbasic}{type}{%
+ \tb@ifvalueisnotempty{type}{#1}{\edef\tb@nt@type{#1}}%
+}
+\define@key{tocbasic}{counterwithin}{%
+ \edef\tb@nt@counterwithin{#1}%
+}
+\define@key{tocbasic}{types}{%
+ \tb@ifvalueisnotempty{types}{#1}{\edef\tb@nt@types{#1}}%
+}
+\define@key{tocbasic}{extension}{%
+ \tb@ifvalueisnotempty{extension}{#1}{\edef\tb@nt@ext{#1}}%
+}
+\define@key{tocbasic}{owner}{%
+ \tb@ifvalueisnotempty{owner}{#1}{\edef\tb@nt@owner{#1}}%
+}
+\define@key{tocbasic}{name}{%
+ \tb@ifvalueisnotempty{name}{#1}{\edef\tb@nt@name{#1}}%
+}
+\define@key{tocbasic}{listname}{%
+ \tb@ifvalueisnotempty{listname}{#1}{\edef\tb@nt@listname{#1}}%
+}
+\newif\iftb@forcenames
+\define@key{tocbasic}{forcenames}[true]{%
+ \lowercase{\tb@boolkey{#1}}{forcenames}%
+}
+\define@key{tocbasic}{level}{%
+ \tb@ifvalueisnotempty{level}{#1}{\tb@numkey\tb@nt@level{#1}}%
+}
+\define@key{tocbasic}{indent}{%
+ \tb@ifvalueisnotempty{indent}{#1}{\tb@dimkey\tb@nt@indent{#1}}%
+}
+\define@key{tocbasic}{hang}{%
+ \tb@ifvalueisnotempty{hang}{#1}{\tb@dimkey\tb@nt@hang{#1}}%
+}
+\newif\iftb@float
+\define@key{tocbasic}{float}[true]{%
+ \lowercase{\tb@boolkey{#1}}{float}%
+}
+\newif\iftb@nonfloat
+\define@key{tocbasic}{nonfloat}[true]{%
+ \lowercase{\tb@boolkey{#1}}{nonfloat}%
+}
+\define@key{tocbasic}{floattype}{%
+ \tb@ifvalueisnotempty{floattype}{#1}{\tb@numkey\tb@nt@floattype{#1}}%
+}
+\define@key{tocbasic}{floatpos}{%
+ \tb@ifvalueisnotempty{floatpos}{#1}{\edef\tb@nt@floatpos{#1}}%
+}
+\newcommand*{\DeclareNewTOC}[2][]{%
+ \tb@floatfalse
+ \tb@nonfloatfalse
+ \tb@forcenamesfalse
+ \def\tb@nt@floattype{\tb@nt@autofloattype}%
+ \def\tb@nt@floatpos{tbp}%
+ \def\tb@nt@ext{#2}%
+ \def\tb@nt@type{#2}%
+ \def\tb@nt@types{\tb@nt@type s}%
+ \def\tb@nt@owner{float}%
+ \def\tb@nt@name{\expandafter\MakeUppercase\tb@nt@type}%
+ \def\tb@nt@listname{List of \expandafter\MakeUppercase\tb@nt@types}%
+ \def\tb@nt@level{1}%
+ \def\tb@nt@indent{1em}%
+ \def\tb@nt@hang{1.5em}%
+ \let\tb@nt@counterwithin\@empty%
+ \setkeys{tocbasic}{#1}%
+ \expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}%
+ \expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext
+ \addtotoclist[\tb@nt@owner]{\csname ext@\tb@nt@type\endcsname}%
+ \@ifundefined{\tb@nt@type name}{%
+ \expandafter\let\csname \tb@nt@type name\endcsname\tb@nt@name
+ }{%
+ \iftb@forcenames
+ \expandafter\let\csname \tb@nt@type name\endcsname\tb@nt@name
+ \fi
+ }%
+ \@ifundefined{list\tb@nt@type name}{%
+ \expandafter\let\csname list\tb@nt@type name\endcsname\tb@nt@listname
+ }{%
+ \iftb@forcenames
+ \expandafter\let\csname list\tb@nt@type name\endcsname\tb@nt@listname
+ \fi
+ }%
+ \expandafter\newcommand\csname listof\tb@nt@ext name\expandafter\endcsname
+ \expandafter{\csname list\tb@nt@type name\endcsname}%
+ \begingroup\edef\@tempa{\endgroup
+ \noexpand\newcommand*\csname listof\tb@nt@types\endcsname{%
+ \noexpand\listoftoc{\tb@nt@ext}%
+ }%
+ }\@tempa
+ \begingroup\edef\@tempa{\endgroup
+ \noexpand\newcommand*\csname l@\tb@nt@type\endcsname{%
+ \noexpand\@dottedtocline{\tb@nt@level}{\tb@nt@indent}{\tb@nt@hang}%
+ }%
+ }\@tempa
+ \begingroup\edef\@tempa{\endgroup
+ \noexpand\newcommand*\csname setup\tb@nt@types\endcsname{%
+ \noexpand\setuptoc{\tb@nt@ext}%
+ }%
+ }\@tempa
+ \@tempswafalse
+ \iftb@float
+ \expandafter\newcommand\expandafter*\csname fps@\tb@nt@type\expandafter
+ \endcsname{\tb@nt@floatpos}%
+ \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
+ }%
+ }%
+ \@tempa
+ \@tempswatrue
+ \fi
+ \iftb@nonfloat
+ \begingroup
+ \edef\@tempa{%
+ \noexpand\endgroup
+ \noexpand\newenvironment{\tb@nt@type-}{%
+ \noexpand\trivlist\noexpand\item\noexpand\relax
+ \noexpand\minipage{\noexpand\linewidth}%
+ \noexpand\def\noexpand\@captype{\tb@nt@type}%
+ }{%
+ \noexpand\endminipage\noexpand\endtrivlist
+ }%
+ }%
+ \@tempa
+ \@tempswatrue
+ \fi
+ \if@tempswa
+ \@ifundefined{c@\tb@nt@type}{%
+ \newcounter{\tb@nt@type}%
+ }{%
+ \PackageWarning{tocbasic}{using already defined counter `\tb@nt@type'}%
+ }%
+ \ifx\tb@nt@counterwithin\@empty\else
+ \@addtoreset{\tb@nt@type}{\tb@nt@counterwithin}%
+ \begingroup\edef\@tempa{%
+ \noexpand\endgroup
+ \noexpand\renewcommand*\expandafter\noexpand
+ \csname the\tb@nt@type\endcsname{%
+ \expandafter\noexpand\csname the\tb@nt@counterwithin\endcsname
+ .\noexpand\arabic{\tb@nt@type}%
+ }%
+ }\@tempa
+ \fi
+ \begingroup
+ \edef\@tempa{%
+ \noexpand\endgroup
+ \noexpand\newcommand*\expandafter\noexpand
+ \csname \tb@nt@type format\endcsname{%
+ \expandafter\noexpand\csname \tb@nt@type name\endcsname
+ \noexpand\nobreakspace
+ \expandafter\noexpand\csname the\tb@nt@type\endcsname
+ \csname autodot\endcsname
+ }%
+ \noexpand\newcommand*\expandafter\noexpand
+ \csname fnum@\tb@nt@type\endcsname{%
+ \expandafter\noexpand\csname \tb@nt@type format\endcsname
+ }%
+ }%
+ \@tempa
+ \fi
+}
+\newcommand*{\tb@ifvalueisnotempty}[2]{%
+ \begingroup
+ \edef\@tempa{#2}\ifx\@tempa\@empty
+ \PackageError{tocbasic}{empty value for key `#1'}{%
+ The argument of key `#1' may not by empty!}%
+ \aftergroup\@gobble
+ \else
+ \aftergroup\@firstofone
+ \fi
+ \endgroup
+}
+\newcommand*{\tb@boolkey}[2]{%
+ \csname tb@#2\ifx\relax#1\relax true\else#1\fi\endcsname
+}
+\newcommand*{\tb@dimkey}[2]{%
+ \begingroup
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \edef\@tempa{\noexpand\endgroup\noexpand\def\noexpand#1{\the\@tempdima}}
+ \@tempa
+}
+\newcommand*{\tb@numkey}[2]{%
+ \begingroup
+ \afterassignment\remove@to@nnil\@tempcnta#2\relax\@nnil
+ \edef\@tempa{\noexpand\endgroup\noexpand\def\noexpand#1{\the\@tempcnta}}
+ \@tempa
+}
+\newcommand*{\tb@nt@autofloattype}{16}
%%% From File: scrlogo.dtx
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 1c4082d98cb..9640c6e8fc5 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
%%% From File: scrktare.dtx
\ProvidesPackage{typearea}[%
@@ -301,7 +301,7 @@
\begingroup
\KOMA@set@ncmdkey{pagesize}{@tempa}{%
{off}{-1},{no}{-1},{false}{-1},%
- {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3}%
+ {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{dvipdfmx}{4}%
}{#1}%
\ifcase\number\@tempa\relax
\endgroup
@@ -318,6 +318,9 @@
\or
\endgroup
\set@pdftexpagesize
+ \or
+ \endgroup
+ \set@dvipdfmxpagesize
\fi
\edef\@pagesizelast{#1}%
}
@@ -362,6 +365,14 @@
}%
}{}%
}
+\newcommand*{\set@dvipdfmxpagesize}{%
+ \scr@ifdvioutput{%
+ \AtBeginDocument{\AtBeginDvi{%
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ }%
+ }%
+ }{}%
+}
\newcommand{\set@vtexpagesize}{%
\AtBeginDocument{%
\ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
@@ -420,6 +431,11 @@
\else
\let\set@dvipspagesize=\setnot@dvipspagesize
\fi
+ \renewcommand*{\set@dvipdfmxpagesize}{%
+ \scr@ifdvioutput{%
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ }{}%
+ }%
\renewcommand*{\set@vtexpagesize}{%
\ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
\ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
@@ -602,8 +618,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{10}
\@namedef{scr@v@3.04a}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.05a}{10}
+\@namedef{scr@v@3.06}{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 4faca0dfbbe..3a57367dcc9 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{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%