summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls23
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty100
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls23
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdoc.cls8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty24
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty133
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty298
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty20
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlettr.cls6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty22
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls329
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls23
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty163
34 files changed, 1058 insertions, 291 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index c890a2ff324..731b0a6201f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
@@ -90,6 +92,7 @@
\LetterOptionNeedsPapersize{%
DIN%
}{a4}
+\setkomavar*{fromzipcode}{D}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{105mm}
\@setplength{mfoldmarkvpos}{\z@}
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index daf00ac70ba..07814fde0b7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
@@ -90,6 +92,7 @@
\LetterOptionNeedsPapersize{%
DINmtext%
}{a4}
+\setkomavar*{fromzipcode}{D}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{87mm}
\@setplength{mfoldmarkvpos}{\z@}
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index f38c53d1a65..7cd347eb800 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -36,8 +36,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -61,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 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 3938dc39fdb..4a88cbeb9a7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
@@ -96,6 +98,7 @@
L%
L%
}{a4}
+\setkomavar*{fromzipcode}{J}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{83mm}
\@setplength{tfoldmarklength}{4mm}
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index ae4855b5335..9cdeebf1166 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
@@ -96,6 +98,7 @@
E%
H%
}{a4}
+\setkomavar*{fromzipcode}{J}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{83mm}
\@setplength{tfoldmarklength}{4mm}
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index 9f7ec422a67..be0f06f463c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
@@ -96,6 +98,7 @@
E%
L%
}{a4}
+\setkomavar*{fromzipcode}{J}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{83mm}
\@setplength{tfoldmarklength}{4mm}
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index 1a63c2ef716..c450aebe82b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
@@ -96,6 +98,7 @@
L%
H%
}{a4}
+\setkomavar*{fromzipcode}{J}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{83mm}
\@setplength{tfoldmarklength}{4mm}
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index 5b94f58c675..47f8dbbf157 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
@@ -96,6 +98,7 @@
L%
L%
}{a4}
+\setkomavar*{fromzipcode}{J}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{83mm}
\@setplength{tfoldmarklength}{4mm}
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 854aa9d8946..c9b8b24295b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: japanlco.dtx
\ProvidesFile{%
@@ -96,6 +98,7 @@
R%
L%
}{a4}
+\setkomavar*{fromzipcode}{J}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{83mm}
\@setplength{tfoldmarklength}{4mm}
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 2ddab3058dc..d6b73892d0e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
@@ -90,6 +92,7 @@
\LetterOptionNeedsPapersize{%
SN%
}{a4}
+\setkomavar*{fromzipcode}{CH}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{105mm}
\@setplength{mfoldmarkvpos}{\z@}
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index 78a27df3be2..9b0a2b0b788 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
@@ -90,6 +92,7 @@
\LetterOptionNeedsPapersize{%
SNleft%
}{a4}
+\setkomavar*{fromzipcode}{CH}
\@setplength{foldmarkhpos}{3.5mm}
\@setplength{tfoldmarkvpos}{105mm}
\@setplength{mfoldmarkvpos}{\z@}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index cf0c251fa13..8b828b58b18 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
@@ -34,8 +34,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scraddr.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 39620173f1d..f4be700576b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -67,8 +67,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -92,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -167,7 +169,9 @@
\@namedef{scr@v@3.01c}{9}
\@namedef{scr@v@3.02}{9}
\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@last}{9}
+\@namedef{scr@v@3.02c}{10}
+\@namedef{scr@v@3.03}{0}
+\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -177,7 +181,8 @@
\setlength{\overfullrule}{\z@}%
\fi
}
-\KOMA@DeclareStandardOption{final}{draft=false}
+\KOMA@DeclareStandardOption
+{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
%%% From File: scrklang.dtx
@@ -3005,9 +3010,13 @@
}
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
- \list{}{\settowidth{\labelwidth}{#2#1}%
+ \list{}{\settowidth{\labelwidth}{{%
+ \usekomafont{labelinglabel}{#1%
+ \usekomafont{labelingseparator}{\sc@septext}}%
+ }}%
\leftmargin\labelwidth \advance\leftmargin by \labelsep
- \let\makelabel\labelinglabel}%
+ \let\makelabel\labelinglabel
+ }%
}{%
\endlist
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 72d01ad5014..817f8d1f764 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -39,8 +39,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -64,7 +66,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -72,30 +74,42 @@
}[%
\KOMAScriptVersion\space package
(KOMA-Script-independent basics and keyval usage)]
-\RequirePackage{keyval}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname ifcsname\endcsname\relax
- \newcommand{\scr@ifundefinedorrelax}[1]{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1\endcsname\relax
- \expandafter\@firstoftwo
+\begingroup
+ \def\@tempb{}%
+ \def\@tempa{%
+ \PackageError{scrbase}{seems you are not running e-TeX\@tempb}{%
+ Since 2004 the LaTeX team recommends to use e-TeX.\MessageBreak
+ KOMA-Script since version 2.95 uses several e-TeX features.\MessageBreak
+ At actual systems `latex' should already use e-TeX.\MessageBreak
+ At deprecated systems it may be called `elatex'.\MessageBreak
+ Use either unsupported KOMA-Script up to version 2.9u or\MessageBreak
+ ask you administrator for LaTeX using e-TeX\@tempb.\MessageBreak
+ Not using e-TeX\@tempb\space is a fatal error!\MessageBreak
+ Processing cannot be continued!}%
+ \endgroup
+ \batchmode \errmessage{}\csname @@end\endcsname\end\relax
+ \csname endinput\endcsname
+ }%
+ \expandafter\ifx\csname eTeXversion\endcsname\relax\else
+ \ifnum\eTeXversion <2
+ \def\@tempb{ V 2}%
\else
- \expandafter\@secondoftwo
+ \let\@tempa\endgroup
\fi
- }
-\else
- \newcommand{\scr@ifundefinedorrelax}[1]{%
- \ifcsname #1\endcsname
- \expandafter\ifx\csname #1\endcsname\relax
- \expandafter\expandafter\expandafter\@firstoftwo
- \else
- \expandafter\expandafter\expandafter\@secondoftwo
- \fi
+ \fi
+\@tempa
+\RequirePackage{keyval}
+\newcommand{\scr@ifundefinedorrelax}[1]{%
+ \ifcsname #1\endcsname
+ \expandafter\ifx\csname #1\endcsname\relax
+ \expandafter\expandafter\expandafter\@firstoftwo
\else
- \expandafter\@firstoftwo
+ \expandafter\expandafter\expandafter\@secondoftwo
\fi
- }
-\fi
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
\newcommand*{\DefineFamily}[1]{%
\scr@ifundefinedorrelax{#1@key@familylist}{%
\@namedef{#1@key@familylist}{}%
@@ -233,7 +247,7 @@
\FamilyProcessOptions{KOMA}\relax
%%% From File: scrklang.dtx
%%% From File: scrlfile.dtx
-\def\scrlfileversion{2008/07/09 v3.00}
+\def\scrlfileversion{2009/03/25 v3.03}
\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
\@tempa
%%% From File: scrkbase.dtx
@@ -298,23 +312,12 @@
\fi
}
\let@as@internal@defined{ifundefinedorrelax}
-\scr@ifundefinedorrelax{ifcsname}{%
- \newcommand{\ifnotundefined}[1]{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1\endcsname\relax
- \expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
- }%
-}{%
- \newcommand{\ifnotundefined}[1]{%
- \ifcsname #1\endcsname
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- }%
+\newcommand{\ifnotundefined}[1]{%
+ \ifcsname #1\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
}
\newcommand\ifstr[2]{%
\begingroup\edef\@tempa{#1}\edef\@tempb{#2}%
@@ -708,9 +711,10 @@
}{%
\begingroup
\let\@tempa\endgroup
- \let #2\undefined\relax
+ \def\@tempb{\relax\undefined\relax}%
+ \let #2\@tempb\relax
\csname captions#1\endcsname
- \ifx #2\undefined
+ \ifx #2\@tempb\relax
\edef\@tempb{#1}%
\@onelevel@sanitize\@tempb
\@onelevel@sanitize\languagename
@@ -744,9 +748,10 @@
\@namedef{captions#1}{}%
}{}%
\begingroup
- \let #2\undefined\relax
+ \def\@tempb{\relax\undefined\relax}%
+ \let #2\@tempb\relax
\csname captions#1\endcsname
- \ifx #2\undefined\else
+ \ifx #2\@tempb\relax\else
\PackageError{scrbase}{%
`\string#2' at language `#1' already defined%
}{%
@@ -785,9 +790,10 @@
\@namedef{captions#1}{}%
}{}%
\begingroup
- \let #2\undefined\relax
+ \def\@tempb{\relax\undefined\relax}%
+ \let #2\@tempb\relax
\csname captions#1\endcsname
- \ifx #2\undefined
+ \ifx #2\@tempb\relax
\PackageError{scrbase}{%
`\string#2' not defined at language `#1'%
}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 479de0783b6..c9c9954477e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -67,8 +67,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -92,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -169,7 +171,9 @@
\@namedef{scr@v@3.01c}{9}
\@namedef{scr@v@3.02}{9}
\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@last}{9}
+\@namedef{scr@v@3.02c}{10}
+\@namedef{scr@v@3.03}{0}
+\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -179,7 +183,8 @@
\setlength{\overfullrule}{\z@}%
\fi
}
-\KOMA@DeclareStandardOption{final}{draft=false}
+\KOMA@DeclareStandardOption
+{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
%%% From File: scrklang.dtx
@@ -3532,9 +3537,13 @@
}
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
- \list{}{\settowidth{\labelwidth}{#2#1}%
+ \list{}{\settowidth{\labelwidth}{{%
+ \usekomafont{labelinglabel}{#1%
+ \usekomafont{labelingseparator}{\sc@septext}}%
+ }}%
\leftmargin\labelwidth \advance\leftmargin by \labelsep
- \let\makelabel\labelinglabel}%
+ \let\makelabel\labelinglabel
+ }%
}{%
\endlist
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 05c87aca453..2cc89ae6edf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -34,8 +34,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrtime.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
index adaa86d374e..c8ac3f55d3e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
@@ -5,10 +5,10 @@
% This file is part of the LaTeX2e KOMA-Script bundle.
%
% This work may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3b of the license.
+% the LaTeX Project Public License, version 1.3c of the license.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
-% and version 1.3b or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later and of this work.
%
% This work has the LPPL maintenance status "author-maintained".
@@ -21,10 +21,10 @@
% Copyright (C) 2002-2009 Markus Kohm
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
-% Version 1.3b, verteilt und/oder veraendert werden.
+% Version 1.3c, verteilt und/oder veraendert werden.
% Die neuste Version dieser Lizenz ist
% http://www.latex-project.org/lppl.txt
-% und Version 1.3b ist Teil aller Verteilungen von LaTeX
+% und Version 1.3c ist Teil aller Verteilungen von LaTeX
% Version 2005/12/01 oder spaeter und dieses Werks.
%
% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index fa88d74a8b0..a22ee356ca1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -56,8 +56,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrextend.dtx
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -114,7 +116,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
@@ -204,7 +206,9 @@
\@namedef{scr@v@3.01c}{9}
\@namedef{scr@v@3.02}{9}
\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@last}{9}
+\@namedef{scr@v@3.02c}{10}
+\@namedef{scr@v@3.03}{0}
+\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -214,7 +218,9 @@
\setlength{\overfullrule}{\z@}%
\fi
}
-\KOMA@DeclareStandardOption{final}{draft=false}
+\KOMA@DeclareStandardOption
+[scrextend]
+{final}{draft=false}
%%% From File: scrkfont.dtx
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
@@ -1111,9 +1117,13 @@
%%% From File: scrklist.dtx
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
- \list{}{\settowidth{\labelwidth}{#2#1}%
+ \list{}{\settowidth{\labelwidth}{{%
+ \usekomafont{labelinglabel}{#1%
+ \usekomafont{labelingseparator}{\sc@septext}}%
+ }}%
\leftmargin\labelwidth \advance\leftmargin by \labelsep
- \let\makelabel\labelinglabel}%
+ \let\makelabel\labelinglabel
+ }%
}{%
\endlist
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
new file mode 100644
index 00000000000..f0f64031a28
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -0,0 +1,133 @@
+%%
+%% This is file `scrhack.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrkvers.dtx (with options: `package,scrhack')
+%% scrhack.dtx (with options: `package,identify')
+%% scrkbase.dtx (with options: `load')
+%% scrhack.dtx (with options: `package,option')
+%% scrhack.dtx (with options: `package,body')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 1994-2009
+%% Markus Kohm and any individual authors listed elsewhere in this file.
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you are not allowed to distribute it.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%%
+%%% From File: scrkvers.dtx
+\begingroup
+ \makeatletter
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
+\endgroup
+%%% From File: scrhack.dtx
+%%% using: package,identify
+\ProvidesPackage{scrhack}
+ [\KOMAScriptVersion\space
+ package (hacking other packages)]
+%%% From File: scrkbase.dtx
+\RequirePackage{scrkbase}[\KOMAScriptVersion]
+%%% From File: scrhack.dtx
+%%% using: package,option
+\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
+\@scrhack@hyperreftrue
+\AtBeginDocument{%
+ \KOMA@key[.scrhack.sty]{hyperref}{%
+ \PackageWarning{scrhack}{option `hyperref=#1' ignored}%
+ }%
+ \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi
+}
+\KOMA@ifkey{float}{@scrhack@float}%
+\@scrhack@floattrue
+\AfterPackage*{float}{%
+ \KOMA@key[.scrhack.sty]{float}{%
+ \PackageWarning{scrhack}{option `float' ignored}%
+ }%
+ \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi
+}
+\KOMA@ifkey{listings}{@scrhack@listings}%
+\@scrhack@listingstrue
+\AfterPackage*{listings}{%
+ \KOMA@key[.scrhack.sty]{listings}{%
+ \PackageWarning{scrhack}{option `listings' ignored}%
+ }%
+ \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi
+}
+\KOMAProcessOptions\relax
+%%% From File: scrhack.dtx
+%%% using: package,body
+\newcommand{\scr@ifexpected}[2]{%
+ \begingroup
+ \let\@tempa#1
+ #2
+ \ifx\@tempa#1
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \endgroup
+}
+\newcommand*{\scr@hack@load}[2]{%
+ \expandafter\ifx\csname ver@#2.#1\endcsname\relax
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ {\PackageInfo{scrhack}{loading #2 hack}%
+ \makeatletter\input{#2.hak}\makeatother}%
+ {\PackageInfo{scrhack}{ignorring #2 hack}}%
+}
+%%% From File: scrlogo.dtx
+\@ifundefined{KOMAScript}{%
+ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
+ M\kern.05em A\kern.1em-\kern.1em Script}}}{}
+\endinput
+%%
+%% End of file `scrhack.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index 269e191ecf3..4d686e1e5fb 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -14,10 +14,10 @@
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3b of the license.
+%% the LaTeX Project Public License, version 1.3c of the license.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later and of this work.
%%
%% This work has the LPPL maintenance status "author-maintained".
@@ -41,10 +41,9 @@
%%% From File: scrjura.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}
- [2008/01/23 v0.4b alpha
+ [2009/03/24 v0.5a beta
(package)%
]
-
\@ifpackageloaded{hyperref}{%
\PackageError{scrjura}{Package hyperref already loaded}{%
If you want to use package scrjura with package hyperref, you have to
@@ -54,26 +53,91 @@
hyperref\MessageBreak
behind the loading of package scrjura.}%
}
+\RequirePackage{scrkbase}
\DeclareOption{contract}{%
\g@addto@macro\document\contract%
}
-\newif\if@juratotoc
-\DeclareOption{juratotoc}{\@juratotoctrue}
+\KOMA@ifkey{juratotoc}{@juratotoc}
\newcommand*{\Paragraphmark}[1]{}
-\DeclareOption{markright}{%
- \renewcommand*{\Paragraphmark}[1]{\markright{#1}}%
-}
-\DeclareOption{markboth}{%
- \renewcommand*{\Paragraphmark}[1]{\markboth{#1}{#1}}%
-}
-\DeclareOption{parcitename}{%
- \AtEndOfPackage{\renewcommand*{\parciteformat}[1]{\parname~#1}}%
+\KOMA@key{paragraphmark}{%
+ \begingroup
+ \KOMA@set@ncmdkey{paragraphmark}{@tempa}{%
+ {false}{0},{off}{0},{no}{0},%
+ {forceright}{1},%
+ {forceboth}{2},%
+ {right}{3},%
+ {both}{4}%
+ }{#1}%
+ \ifcase\number\@tempa
+ \endgroup
+ \let\Paragraphmark\@gobble
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{\markright{##1}}%
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{\markboth{##1}{##1}}%
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{%
+ \ifx\@mkboth\@gobbletwo\else\markright{##1}\fi}%
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{\@mkboth{##1}{##1}}%
+ \else
+ \endgroup
+ \fi
}
-\DeclareOption{sentencecitename}{%
- \AtEndOfPackage{\renewcommand*{\sentenceciteformat}[1]{\sentencename~#1}}%
+\KOMA@DeclareDeprecatedOption[scrjura]{markright}{paragraphmark=forceright}
+\KOMA@DeclareDeprecatedOption[scrjura]{markboth}{paragraphmark=forceboth}
+\newcommand*{\parcite@format}{0}
+\newcommand*{\sentencecite@format}{0}
+\KOMA@key{ref}{%
+ \begingroup
+ \KOMA@set@ncmdkey{ref}{@tempa}{%
+ {parlong}{1},{longpar}{1},{ParL}{1},%
+ {parshort}{2},{shortpar}{2},{ParS}{2},%
+ {parnumeric}{3},{numericpar}{3},{ParN}{3},%
+ {sentencelong}{10},{longsentence}{10},{SentenceL}{10},%
+ {sentenceshort}{20},{shortsentence}{20},{SentenceS}{20},%
+ {sentencenumeric}{30},{numericsentence}{30},{SentenceN}{30},%
+ {long}{11},%
+ {short}{22},%
+ {numeric}{33}%
+ }{#1}%
+ \@tempcnta=\@tempa\relax
+ \@tempcntb=\z@
+ \@whilenum \@tempcnta>9 \do{%
+ \advance\@tempcnta -10\relax
+ \advance\@tempcntb \@ne\relax
+ }%
+ \ifcase \@tempcnta
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup0\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup1\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup2\aftergroup}%
+ \fi
+ \ifcase \@tempcntb
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup0\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup1\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup2\aftergroup}%
+ \fi
+ \endgroup
}
-\ProcessOptions\relax
-\RequirePackage{keyval}
+\KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
+\KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
+\KOMAProcessOptions\relax
\newcommand*{\contract}{%
\renewcommand*{\contract}{%
\contract@nest@error{contract}%
@@ -93,7 +157,9 @@
\let\cl@SubParagraph\@empty
\newcounter{contractParagraph}
\renewcommand*{\thecontractParagraph}{%
- {\S~\arabic{contractParagraph}}}
+ {\contract@Paragraphformat{\arabic{contractParagraph}}}}
+\DeclareRobustCommand*{\contract@Paragraphformat}[1]{\paragraphformat{#1}}
+\newcommand*{\paragraphformat}[1]{\S~#1}
\newcounter{contractSubParagraph}
\@addtoreset{SubParagraph}{Paragraph}
\renewcommand*{\thecontractSubParagraph}{%
@@ -311,9 +377,36 @@
\setcounter{sentence}{0}\refstepcounter{sentence}%
\fi
}
-\newcommand*{\refParagraph}[1]{%
- \expandafter\ifx\csname r@#1\endcsname\relax
- \ref{#1}%
+\newcommand*{\refL}{\@ifstar {\ref@L*}{\ref@L{}}}
+\newcommand*{\ref@L}[2]{%
+ \begingroup
+ \def\parcite@format{0}%
+ \let\sentencecite@format\parcite@format
+ \ref#1{#2}%
+ \endgroup
+}
+\newcommand*{\refS}{\@ifstar {\ref@S*}{\ref@S{}}}
+\newcommand*{\ref@S}[2]{%
+ \begingroup
+ \def\parcite@format{1}%
+ \let\sentencecite@format\parcite@format
+ \ref#1{#2}%
+ \endgroup
+}
+\newcommand*{\refN}{\@ifstar {\ref@N*}{\ref@N{}}}
+\newcommand*{\ref@N}[2]{%
+ \begingroup
+ \def\parcite@format{2}%
+ \let\sentencecite@format\parcite@format
+ \ref#1{#2}%
+ \endgroup
+}
+\newcommand*{\refParagraph}{%
+ \@ifstar {\ref@Paragraph*}{\ref@Paragraph{}}
+}
+\newcommand*{\ref@Paragraph}[2]{%
+ \expandafter\ifx\csname r@#2\endcsname\relax
+ \ref#1{#2}%
\else
\begingroup
\expandafter\expandafter\expandafter\expandafter
@@ -322,24 +415,36 @@
\expandafter\expandafter\expandafter\@tempb
\expandafter\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter{%
- \expandafter\expandafter\expandafter\@gobble\csname r@#1\endcsname}%
+ \expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}%
\def\@tempc##1##2\@nil{##1}%
\let\jura@separator\@gobble
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
- \csname r@#1\endcsname\noexpand\@nil}%
+ \csname r@#2\endcsname\noexpand\@nil}%
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
\@tempa\@nil}%
\let\@@protect\protect
\let\protect\noexpand
- \expandafter\edef\csname r@#1\endcsname{{\@tempa}\@tempb}%
+ \expandafter\edef\csname r@#2\endcsname{{\@tempa}\@tempb}%
\let\protect\@@protect
- \ref{#1}%
+ \ref#1{#2}%
\endgroup
\fi
}
-\newcommand*{\refPar}[1]{%
- \expandafter\ifx\csname r@#1\endcsname\relax
- \ref{#1}%
+\newcommand*{\refParagraphN}{%
+ \@ifstar {\ref@ParagraphN*}{\ref@ParagraphN{}}
+}
+\newcommand*{\ref@ParagraphN}[2]{%
+ \begingroup
+ \let\paragraphformat\relax
+ \ref@Paragraph{#1}{#2}%
+ \endgroup
+}
+\newcommand*{\refPar}{%
+ \@ifstar {\ref@Par*}{\ref@Par{}}
+}
+\newcommand*{\ref@Par}[2]{%
+ \expandafter\ifx\csname r@#2\endcsname\relax
+ \ref#1{#2}%
\else
\begingroup
\expandafter\expandafter\expandafter\expandafter
@@ -348,30 +453,63 @@
\expandafter\expandafter\expandafter\@tempb
\expandafter\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter{%
- \expandafter\expandafter\expandafter\@gobble\csname r@#1\endcsname}%
+ \expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}%
\def\@tempc##1##2\@nil{##1}%
\let\jura@separator\@gobble
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
- \csname r@#1\endcsname\noexpand\@nil}%
+ \csname r@#2\endcsname\noexpand\@nil}%
\def\@tempc##1##2##3\@nil{##2}%
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
\@tempa{%
\protect\G@refundefinedtrue
\nfss@text{\reset@font\bfseries ??}%
- \@latex@warning{Reference `#1' on page \thepage \space
+ \@latex@warning{Reference `#2' on page \thepage \space
with undefined par number}%
}\noexpand\@nil}%
\let\@@protect\protect
\let\protect\noexpand
- \expandafter\edef\csname r@#1\endcsname{{\@tempa}\@tempb}%
+ \expandafter\edef\csname r@#2\endcsname{{\@tempa}\@tempb}%
\let\protect\@@protect
- \ref{#1}%
+ \ref#1{#2}%
\endgroup
\fi
}
-\newcommand*{\refSentence}[1]{%
- \expandafter\ifx\csname r@#1\endcsname\relax
- \ref{#1}%
+\newcommand*{\refParL}{%
+ \@ifstar {\ref@ParX0*}{\ref@ParX0{}}
+}
+\newcommand*{\ref@ParX}[3]{%
+ \begingroup
+ \def\parcite@format{#1}%
+ \let\sentencecite@format\parcite@format
+ \ref@Par{#2}{#3}%
+ \endgroup
+}
+\newcommand*{\refParS}{%
+ \@ifstar {\ref@ParX1*}{\ref@ParX1{}}
+}
+\newcommand*{\refParN}{%
+ \@ifstar {\ref@ParN2*}{\ref@ParN2{}}
+}
+\newcommand*{\ref@ParN}[2]{%
+ \@ifnextchar [%]
+ {\ref@@ParN{#1}{#2}}%
+ {\ref@ParX{#1}{#2}}%
+}
+\newcommand*{\ref@@ParN}{}
+\def\ref@@ParN#1#2[#3]#4{%
+ \begingroup
+ \renewcommand*{\parnumericformat}[1]{%
+ \csname @#3\endcsname{\number ##1\relax}%
+ }%
+ \ref@ParX{#1}{#2}{#4}%
+ \endgroup
+}
+\newcommand*{\refSentence}{%
+ \@ifstar {\ref@Sentence*}{\ref@Sentence{}}
+}
+\newcommand*{\ref@Sentence}[2]{%
+ \expandafter\ifx\csname r@#2\endcsname\relax
+ \ref#1{#2}%
\else
\begingroup
\expandafter\expandafter\expandafter\expandafter
@@ -380,27 +518,43 @@
\expandafter\expandafter\expandafter\@tempb
\expandafter\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter{%
- \expandafter\expandafter\expandafter\@gobble\csname r@#1\endcsname}%
+ \expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}%
\def\@tempc##1##2\@nil{##1}%
\let\jura@separator\@gobble
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
- \csname r@#1\endcsname\noexpand\@nil}%
+ \csname r@#2\endcsname\noexpand\@nil}%
\def\@tempc##1##2##3##4\@nil{##3}%
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
\@tempa{}{%
\protect\G@refundefinedtrue
\nfss@text{\reset@font\bfseries ??}%
- \@latex@warning{Reference `#1' on page \thepage \space
+ \@latex@warning{Reference `#2' on page \thepage \space
with undefined sentence number}%
}\noexpand\@nil}%
\let\@@protect\protect
\let\protect\noexpand
- \expandafter\edef\csname r@#1\endcsname{{\@tempa}\@tempb}%
+ \expandafter\edef\csname r@#2\endcsname{{\@tempa}\@tempb}%
\let\protect\@@protect
- \ref{#1}%
+ \ref#1{#2}%
\endgroup
\fi
}
+\newcommand*{\refSentenceL}{%
+ \@ifstar {\ref@SentenceX0*}{\ref@SentenceX0{}}
+}
+\newcommand*{\ref@SentenceX}[3]{%
+ \begingroup
+ \def\parcite@format{#1}%
+ \let\sentencecite@format\parcite@format
+ \ref@Sentence{#2}{#3}%
+ \endgroup
+}
+\newcommand*{\refSentenceS}{%
+ \@ifstar {\ref@SentenceX1*}{\ref@SentenceX1{}}
+}
+\newcommand*{\refSentenceN}{%
+ \@ifstar {\ref@SentenceX2*}{\ref@SentenceX2{}}
+}
\newcounter{sentence}[par]
\renewcommand*{\thesentence}{\arabic{sentence}}
\newcommand*{\theHsentence}{\theHpar-\arabic{sentence}}
@@ -412,21 +566,59 @@
\ensuremath{^{\mbox{\fontsize\sf@size\z@\selectfont\thesentence}}}%
}
\DeclareRobustCommand*{\par@cite}[1]{\parciteformat{#1}}
-\newcommand*{\parciteformat}[1]{\@Roman{\numexpr #1\relax}}
+\newcommand*{\parciteformat}[1]{%
+ \ifcase \parcite@format
+ \parlongformat{#1}%
+ \or
+ \parshortformat{#1}%
+ \or
+ \parnumericformat{#1}%
+ \fi
+}
\DeclareRobustCommand*{\sentence@cite}[1]{\sentenceciteformat{#1}}
-\newcommand*{\sentenceciteformat}[1]{\@arabic{\numexpr #1\relax}}
+\newcommand*{\sentenceciteformat}[1]{%
+ \ifcase \sentencecite@format
+ \sentencelongformat{#1}%
+ \or
+ \sentenceshortformat{#1}%
+ \or
+ \sentencenumericformat{#1}%
+ \fi
+}
+\newcommand*{\parlongformat}[1]{\parname~#1}
+\newcommand*{\parshortformat}[1]{\parshortname~#1}
+\newcommand*{\parnumericformat}[1]{\@Roman{\number #1\relax}}
+\newcommand*{\sentencelongformat}[1]{\sentencename~#1}
+\newcommand*{\sentenceshortformat}[1]{\sentenceshortname~#1}
+\newcommand*{\sentencenumericformat}[1]{\@arabic{\number #1\relax}.}
\newcommand*{\parname}{Paragraph}
\AtBeginDocument{%
- \@ifundefined{captionsgerman}{}{%
- \addto\captionsgerman{\def\parname{Absatz}}%
- \addto\captionsgerman{\def\sentencename{Satz}}%
- \ifnum \l@german=\language\selectlanguage{german}\fi
- }%
- \@ifundefined{captionsngerman}{}{%
- \addto\captionsngerman{\def\parname{Absatz}}%
- \addto\captionsngerman{\def\sentencename{Satz}}%
- \ifnum \l@ngerman=\language\selectlanguage{ngerman}\fi
+ \providecaptionname{german}\parname{Absatz}%
+ \providecaptionname{german}\parshortname{Abs.}%
+ \providecaptionname{german}\sentencename{Satz}%
+ \providecaptionname{german}\sentenceshortname{S.}%
+ \providecaptionname{ngerman}\parname{Absatz}%
+ \providecaptionname{ngerman}\parshortname{Abs.}%
+ \providecaptionname{ngerman}\sentencename{Satz}%
+ \providecaptionname{ngerman}\sentenceshortname{S.}%
+}
+\providecommand*{\parname}{\scrjura@lang@error{\parname}}
+\providecommand*{\parshortname}{\scrjura@lang@error{\parshortname}}
+\providecommand*{\sentencename}{\scrjura@lang@error{\sentencename}}
+\providecommand*{\sentenceshortname}{\scrjura@lang@error{\sentenceshortname}}
+\newcommand*{\scrjura@lang@error}[1]{%
+ \PackageErrorNoLine{scrjura}{%
+ current language not supported%
+ }{%
+ Currently scrjura only supports languages ``german'' and
+ ``ngerman''.\MessageBreak
+ It seems, that you are using another language (maybe
+ \languagename).\MessageBreak
+ Because of this you have to define \string#1\space by
+ yourself!\MessageBreak
+ It would be nice if you'll send your definitions to the author.%
}%
+ \textbf{??}%
}
\newcommand*{\newmaxpar}[3]{%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index dce968a1700..9626a5c072c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -37,8 +37,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -62,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -79,7 +81,7 @@
\@onlypreamble\KOMAProcessOptions
\KOMAProcessOptions\relax
%%% From File: scrlfile.dtx
-\def\scrlfileversion{2008/07/09 v3.00}
+\def\scrlfileversion{2009/03/25 v3.03}
\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
\@tempa
%%% From File: scrkbase.dtx
@@ -136,9 +138,15 @@
\post@kopt@hook\let\post@kopt@hook\relax
}
\newcommand*{\KOMA@unknown@keyval}{\FamilyUnknownKeyValue{KOMA}}
-\newcommand*{\KOMA@ifkey}{\FamilyBoolKey{KOMA}}
+\newcommand*{\KOMA@ifkey}{%
+ \DefineFamilyMember{KOMA}%
+ \FamilyBoolKey{KOMA}%
+}
\newcommand*{\KOMA@set@ifkey}{\FamilySetBool{KOMA}}
-\newcommand*{\KOMA@ncmdkey}{\FamilyNumericalKey{KOMA}}
+\newcommand*{\KOMA@ncmdkey}{%
+ \DefineFamilyMember{KOMA}%
+ \FamilyNumericalKey{KOMA}%
+}
\newcommand*{\KOMA@set@ncmdkey}{\FamilySetNumerical{KOMA}}
\newcommand*{\KOMA@DeclareDeprecatedOption}{%
\@ifnextchar [%]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
index 0566b005b08..e276d02f9b7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
@@ -34,8 +34,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From: scrlettr.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 1f441671ffe..325d0f5c279 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -14,10 +14,10 @@
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3b of the license.
+%% the LaTeX Project Public License, version 1.3c of the license.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later and of this work.
%%
%% This work has the LPPL maintenance status "author-maintained".
@@ -41,7 +41,7 @@
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
%%% From File: scrlfile.dtx
-\def\scrlfileversion{2008/07/09 v3.00}
+\def\scrlfileversion{2009/03/25 v3.03}
\ProvidesPackage{scrlfile}[%
\scrlfileversion\space KOMA-Script package (loading files)]
\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
@@ -167,9 +167,16 @@
\scr@restore@newpage
\let\clearpage=\scr@saved@clearpage}%
\fi%
+ \let\scr@saved@dofilelist\@dofilelist
+ \def\@dofilelist{%
+ \scr@hook@acma
+ \let\@dofilelist\scr@saved@dofilelist
+ \scr@saved@dofilelist
+ }%
}%
}
\newcommand*{\scr@saved@checkend}{}
+\newcommand*{\scr@saved@dofilelist}{}
\newcommand*{\scr@redefine@newpage}{%
\let\scr@saved@newpage\newpage
\def\scr@restore@newpage{%
@@ -203,6 +210,7 @@
}
\newcommand*{\scr@restore@newpage}{}
\newcommand*{\scr@hook@bcma}{}
+\newcommand*{\scr@hook@acma}{}
\newcommand*{\BeforeClosingMainAux}{%
\ifx\scr@hook@bcma\@empty
\gdef\scr@hook@bcma{%
@@ -212,6 +220,14 @@
\fi
\g@addto@macro\scr@hook@bcma%
}
+\newcommand*{\AfterReadingMainAux}{%
+ \ifx\scr@hook@acma\@empty
+ \gdef\scr@hook@acma{%
+ \renewcommand*{\AfterReadingMainAux}[1]{####1}%
+ }%
+ \fi
+ \g@addto@macro\scr@hook@acma%
+}
%%% 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 7c1448ca5f9..1933305c456 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -66,8 +66,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -91,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -159,7 +161,9 @@
\@namedef{scr@v@3.01c}{9}
\@namedef{scr@v@3.02}{9}
\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@last}{9}
+\@namedef{scr@v@3.02c}{10}
+\@namedef{scr@v@3.03}{0}
+\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -169,7 +173,8 @@
\setlength{\overfullrule}{\z@}%
\fi
}
-\KOMA@DeclareStandardOption{final}{draft=false}
+\KOMA@DeclareStandardOption
+{final}{draft=false}
%%% From File: scrklco.dtx
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -569,8 +574,60 @@
\KOMA@ifkey{fromemail}{@email}
\KOMA@ifkey{fromurl}{@www}
\KOMA@ifkey{fromlogo}{@logo}
-\newif\if@afield\@afieldtrue
-\KOMA@ifkey{addrfield}{@afield}
+\newcommand*{\if@afield}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of \string\if@afield\space deprecated.\MessageBreak
+ Internal macro \string\if@afield\space was removed at\MessageBreak
+ KOMA-Script version 3.03. I'll replace the usage of\MessageBreak
+ \string\if@afield\space by \string\ifnum
+ \string\@afieldmode=\string\@ne.\MessageBreak
+ This may result in errors. A better solution would be\MessageBreak
+ to change the code}%
+ \ifnum \@afieldmode=\@ne}
+\newcommand*{\@afieldtrue}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of \string\if@afield\space deprecated.\MessageBreak
+ Internal macro \string\if@afield\space was removed at\MessageBreak
+ KOMA-Script version 3.03. I'll replace the usage of\MessageBreak
+ \string\@afieldtrue\space by
+ \string\KOMAoptions{addrfield=true}.\MessageBreak
+ This may result in erros. A better solution would be\MessageBreak
+ to change the code}%
+ \KOMAoptions{addrfield=true}}
+\newcommand*{\@afieldfalse}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of \string\if@afield\space deprecated.\MessageBreak
+ Internal macro \string\if@afield\space was removed at\MessageBreak
+ KOMA-Script version 3.03. I'll replace the usage of\MessageBreak
+ \string\@afieldfalse\space by
+ \string\KOMAoptions{addrfield=false}.\MessageBreak
+ This may result in erros. A better solution would be\MessageBreak
+ to change the code}%
+ \KOMAoptions{addrfield=false}}
+\newcommand*{\@afieldmode}{\@ne}
+\KOMA@ncmdkey{addrfield}[true]{@afieldmode}{%
+ {false}{0},{off}{0},{no}{0},%
+ {true}{1},{on}{1},{yes}{1},%
+ {PP}{2},{pp}{2},%
+ {PPexplicite}{2},{PPExplicite}{2},%
+ {ppexplicite}{2},{ppExplicite}{2},%
+ {backgroundimage}{3},%
+ {PPbackgroundimage}{3},{PPBackgroundImage}{3},{PPBackGroundImage}{3},%
+ {ppbackgroundimage}{3},{ppBackgroundImage}{3},{ppBackGroundImage}{3},%
+ {image}{4},{Image}{4},%
+ {PPimage}{4},{PPImage}{4},%
+ {ppimage}{4},{ppImage}{4}%
+}
+\newcommand*{\ltr@priority}{0}%
+\KOMA@ncmdkey{priority}[A]{ltr@priority}{%
+ {no}{0},{off}{0},{false}{0},{manual}{1},%
+ {B}{1},{b}{1},%
+ {economy}{1},{Economy}{1},{ECONOMY}{1},%
+ {B-ECONOMY}{1},{B-Economy}{1},{b-economy}{1},%
+ {A}{2},{a}{2},%
+ {priority}{2},{Priority}{2},{PRIORITY}{2},%
+ {A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
+}%
\newcommand{\backaddr@format}[1]{}
\let\backaddr@format\underline
\newif\if@baddr\@baddrtrue
@@ -1784,16 +1841,16 @@
\newcommand*{\@komavar@err}[2]{%
\ClassError{%
scrlttr2%
- }{%
+ }{%
KOMA-Script variable not defined%
- }{%
+ }{%
You've tried to #1 the not defined KOMA-Script variable
`#2'.\MessageBreak
You have to define the variable using \string\newkomavar\space
before\MessageBreak
you do this.%
- }%
- }
+ }%
+}
\DeclareRobustCommand*{\usekomavar}{%
\@ifstar {\@usekomaname}{\@usekomavar}}
\newcommand*{\@usekomavar}[2][\@firstofone]{%
@@ -1810,32 +1867,43 @@
#1{\@nameuse{scr@#2@name}}%
}%
}
+\DeclareRobustCommand*{\ifkomavar}[1]{%
+ \scr@ifundefinedorrelax{scr@#1@var}{%
+ \expandafter\@secondoftwo
+ }{%
+ \expandafter\@firstoftwo
+ }%
+}
\DeclareRobustCommand*{\ifkomavarempty}{%
\begingroup
\@ifstar {\@tempswatrue\@ifkomavarempty}%
{\@tempswafalse\@ifkomavarempty}%
}
-\newcommand{\@ifkomavarempty}[3]{%
- \@ifundefined{scr@#1@var}{%
- \endgroup\@komavar@err{use}{#1}%
- }{%
- \if@tempswa\endgroup
- \@ifundefined{scr@#1@name}{#2}{%
- \expandafter\ifx\csname scr@#1@name\endcsname\@empty
- #2%
- \else
- #3%
- \fi
+\newcommand{\@ifkomavarempty}[1]{%
+ \ifkomavar{#1}{%
+ \if@tempswa
+ \@ifundefined{scr@#1@name}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifx\csname scr@#1@name\endcsname\@empty
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
}%
- \else\endgroup
- \expandafter\ifx\csname scr@#1@var\endcsname\@empty
- #2%
\else
- #3%
+ \expandafter\ifx\csname scr@#1@var\endcsname\@empty
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
\fi
- \fi
+ }{%
+ \@komavar@err{use}{#1}%
+ \aftergroup\@gobbletwo
}%
- }
+ \endgroup
+}
%%% From File: scrkplen.dtx
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
@@ -2227,9 +2295,13 @@
}
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
- \list{}{\settowidth{\labelwidth}{#2#1}%
+ \list{}{\settowidth{\labelwidth}{{%
+ \usekomafont{labelinglabel}{#1%
+ \usekomafont{labelingseparator}{\sc@septext}}%
+ }}%
\leftmargin\labelwidth \advance\leftmargin by \labelsep
- \let\makelabel\labelinglabel}%
+ \let\makelabel\labelinglabel
+ }%
}{%
\endlist
}
@@ -2459,6 +2531,10 @@
\newkomafont{fromrule}{}
\newkomafont{backaddress}{\sffamily}
\newkomafont{specialmail}{}
+\newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries}
+\newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont}
+\newkomafont{PPlogo}{\sffamily\bfseries}
+\newkomafont{PPdata}{\sffamily}
\newkomafont{addressee}{}
\newkomafont{toname}{}
\newkomafont{toaddress}{}
@@ -2489,6 +2565,9 @@
\@newplength{specialmailindent}
\@newplength{specialmailrightindent}
\@newplength{toaddrindent}
+\@newplength{PPheadheight}
+\@newplength{PPheadwidth}
+\@newplength{PPdatamatrixvskip}
\@newplength{toaddrwidth}
\@newplength{toaddrheight}
\@newplength{locvpos}
@@ -2717,7 +2796,9 @@
}%
}
\newcommand*{\@addrfield}{%
- \if@afield
+ \ifcase \@afieldmode\relax
+ \typeout{Address: No}%
+ \or
\begingroup%
\if@baddr
\ifkomavarempty{backaddress}{%
@@ -2728,9 +2809,15 @@
\else
\let\@tempa\@empty\let\@tempb\@empty
\fi
- \ifkomavarempty{specialmail}{}{%
- \edef\@tempa{\@tempa\@tempb specialmail}\def\@tempb{,\space}%
- }%
+ \ifcase \ltr@priority
+ \ifkomavarempty{specialmail}{}{%
+ \edef\@tempa{\@tempa\@tempb specialmail}\def\@tempb{,\space}%
+ }%
+ \or
+ \edef\@tempa{\@tempa\@tempb B-Economy}\def\@tempb{,\space}%
+ \or
+ \edef\@tempa{\@tempa\@tempb A-Priority}\def\@tempb{,\space}%
+ \fi
\typeout{Address (\@tempa\@tempb addressee)}%
\endgroup%
\move@topt\vskip\useplength{toaddrvpos}%
@@ -2754,6 +2841,20 @@
\usekomavar{backaddress}}}}%
\fi
}{backaddress}{backaddrheight}{\setkomavar}%
+ \ifcase \ltr@priority
+ \or
+ \setkomavar{specialmail}{%
+ {\usekomafont{priority}{%
+ {\usekomafont{prioritykey}{B}}%
+ -ECONOMY}}%
+ }%
+ \or
+ \setkomavar{specialmail}{%
+ {\usekomafont{priority}{%
+ {\usekomafont{prioritykey}{A}}%
+ -PRIORITY}}%
+ }%
+ \fi
\ifkomavarempty{specialmail}{}{%
\vbox{\hsize\useplength{toaddrwidth}%
\noindent\hspace*{\useplength{specialmailindent}}%
@@ -2771,15 +2872,163 @@
\usekomafont{toaddress}{\usekomavar{toaddress}}}}%
\vfil\null}%
{address field}{toaddrheight}%
- {\begin{letter} or you\MessageBreak
+ {\string\begin{letter} or you\MessageBreak
have to define a smaller special purpose using\MessageBreak
\string\specialmail}%
}}}%
\vskip-\useplength{toaddrvpos}\move@frompt
\else
- \typeout{Address: No}%
+ \begingroup%
+ \if@baddr
+ \let\@tempa\@empty\let\@tempb\@empty
+ \ifcase \@afieldmode\relax\or\or
+ \def\@tempa{PP-mode}\def\@tempb{,\space}%
+ \or
+ \def\@tempa{backgroundimage-mode}\def\@tempb{,\space}%
+ \or
+ \def\@tempa{image-mode}\def\@tempb{,\space}%
+ \fi
+ \ifkomavarempty{backaddress}{}{%
+ \edef\@tempa{\@tempa\@tempb backaddress ignored}\def\@tempb{,\space}%
+ }%
+ \else
+ \let\@tempa\@empty\let\@tempb\@empty
+ \fi
+ \ifcase \ltr@priority
+ \ifkomavarempty{specialmail}{}{%
+ \edef\@tempa{\@tempa\@tempb specialmail ignored}\def\@tempb{,\space}%
+ }%
+ \or
+ \edef\@tempa{\@tempa\@tempb B-Economy}\def\@tempb{,\space}%
+ \or
+ \edef\@tempa{\@tempa\@tempb A-Priority}\def\@tempb{,\space}%
+ \fi
+ \typeout{Address (\@tempa\@tempb addressee)}%
+ \endgroup%
+ \move@topt\vskip\useplength{toaddrvpos}%
+ \vb@t@z{{%
+ \setlength{\parfillskip}{\z@ \@plus 1fil}%
+ \setlength{\parindent}{\z@}%
+ \setlength{\parskip}{\z@}%
+ \ifdim \useplength{toaddrindent}=\z@
+ \@setplength{toaddrindent}{8mm}%
+ \fi
+ \ifdim \useplength{PPheadheight}=\z@
+ \@setplength{PPheadheight}{20.74pt}%
+ \fi
+ \ifdim \useplength{PPheadwidth}=\z@
+ \@setplength{PPheadwidth}{42mm}%
+ \fi
+ \ifdim \useplength{PPdatamatrixvskip}=\z@
+ \@setplength{PPdatamatrixvskip}{9mm}%
+ \fi
+ \rlap{\move@topl
+ \setlengthtoplength{\@tempskipa}{toaddrhpos}%
+ \ifdim \@tempskipa<\z@
+ \addtolength{\@tempskipa}{\paperwidth}%
+ \addtolengthplength[-]{\@tempskipa}{toaddrwidth}%
+ \fi
+ \hskip\@tempskipa
+ \@savevbox{\useplength{toaddrheight}}{\hsize\useplength{toaddrwidth}%
+ \ifnum\@afieldmode=\tw@
+ \vskip 2pt\relax
+ \hskip \useplength{toaddrindent}\relax
+ \fbox{%
+ \vbox to \dimexpr \useplength{PPheadheight}-2\fboxsep\relax{%
+ \setlength{\parindent}{0pt}%
+ \hsize \dimexpr \useplength{PPheadwidth}-2\fboxsep\relax
+ \setbox\@tempboxa\hbox{%
+ {\fontsize{20.74pt}{20.74pt}\selectfont
+ \usekomafont{PPlogo}{P.P.}}\hskip 2mm%
+ }%
+ \dp\@tempboxa\z@
+ \setlength{\@tempdima}{\hsize}%
+ \addtolength{\@tempdima}{-\wd\@tempboxa}%
+ \hbox{\box\@tempboxa
+ \vbox to \dimexpr
+ \useplength{PPheadheight}-2\fboxsep\relax{%
+ \vss\hsize\@tempdima
+ \raggedright
+ \fontsize{8pt}{9pt}\selectfont\usekomafont{PPdata}%
+ \usekomavar*{fromzipcode}\usekomavar{zipcodeseparator}%
+ \usekomavar{fromzipcode}\unskip\strut\\
+ \usekomavar{place}\unskip\strut
+ \hfill
+ }%
+ }%
+ \vss
+ }%
+ }%
+ \hskip 1mm
+ \mbox{%
+ \vbox to \useplength{PPheadheight}{%
+ \addtolengthplength[-]{\hsize}{PPheadwidth}%
+ \addtolength{\hsize}{-1mm}%
+ \addtolengthplength[-2]{\hsize}{toaddrindent}%
+ \setlength{\parindent}{0pt}%
+ \fontsize{8pt}{9pt}\selectfont\usekomafont{PPdata}%
+ \hfill\usekomavar{PPcode}
+ \vss
+ \ifcase \ltr@priority
+ \or
+ \usekomafont{priority}{%
+ {\usekomafont{prioritykey}{B}}%
+ -ECONOMY\hss\vskip-\dp\strutbox
+ }%
+ \or
+ \usekomafont{priority}{%
+ {\usekomafont{prioritykey}{A}}%
+ -PRIORITY\hss\vskip-\dp\strutbox
+ }%
+ \fi
+ \vss
+ }%
+ }%
+ \vskip 1mm
+ \vskip-\ht\strutbox
+ \noindent\hskip\useplength{toaddrindent}%
+ \hrulefill%
+ \hskip\useplength{toaddrindent}%
+ \vbox to\z@{\hsize\z@
+ \vskip \useplength{PPdatamatrixvskip}\relax
+ \llap{\usekomavar{PPdatamatrix}\hskip\useplength{toaddrindent}}%
+ \vss
+ }%
+ \else
+ \vskip 1mm
+ \noindent\expandafter\hskip\useplength{toaddrindent}%
+ \vbox to \useplength{PPheadheight}{%
+ \addtolengthplength[-2]{\hsize}{toaddrindent}%
+ \setlength{\parindent}{0pt}%
+ \usekomavar{addresseimage}%
+ \vss
+ }%
+ \vskip 1mm
+ \vskip\dp\strutbox
+ \fi
+ \ifnum \@afieldmode=4 \else
+ \vfil%
+ \noindent\hskip\useplength{toaddrindent}%
+ \setlength{\@tempdima}{\useplength{toaddrwidth}}%
+ \addtolengthplength[-2]{\@tempdima}{toaddrindent}%
+ \vbox{\hsize\@tempdima
+ \ifkomavarempty{PPdatamatrix}{}{%
+ \addtolength{\hsize}{-2mm}%
+ \settowidth\@tempdima{\usekomavar{PPdatamatrix}}%
+ \addtolength{\hsize}{-\@tempdima}%
+ }%
+ \raggedright
+ \usekomafont{addressee}{%
+ \usekomafont{toname}{\usekomavar{toname}\\}%
+ \usekomafont{toaddress}{\usekomavar{toaddress}}}}%
+ \fi
+ \vss\null}%
+ {address field}{toaddrheight}%
+ {\string\begin{letter}}%
+ }}}%
+ \vskip-\useplength{toaddrvpos}\move@frompt
\fi
- }
+}
\newcommand*{\specialmail@format}[1]{}
\let\specialmail@format\underline
\newcommand*{\@ogobble}[1][]{}
@@ -3270,6 +3519,10 @@
\newkomavar{specialmail}
\newkomavar{title}
\newkomavar{fromlogo}
+\newkomavar{fromzipcode}
+\newkomavar{PPcode}
+\newkomavar{PPdatamatrix}
+\newkomavar{addresseimage}
\newkomavar[\usekomavar{place}]{placeseparator}
\setkomavar{placeseparator}{,~}
\newkomavar[\subjectname]{subjectseparator}
@@ -3288,6 +3541,8 @@
\setkomavar{emailseparator}{:~}
\newkomavar[\wwwname]{urlseparator}
\setkomavar{urlseparator}{:~}
+\newkomavar{zipcodeseparator}
+\setkomavar{zipcodeseparator}{\,--\,}
\newkomavar[\headfromname]{fromname}
\newkomavar[\usekomavar{fromname}]{fromaddress}
\newkomavar[\headtoname]{toname}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
index f5224fd62bb..fb23e254015 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
@@ -34,8 +34,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrpage.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 326bba430df..16694958e30 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -34,8 +34,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrpage.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index b11db22bf1e..56f2cf7895e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -67,8 +67,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -92,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -169,7 +171,9 @@
\@namedef{scr@v@3.01c}{9}
\@namedef{scr@v@3.02}{9}
\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@last}{9}
+\@namedef{scr@v@3.02c}{10}
+\@namedef{scr@v@3.03}{0}
+\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -179,7 +183,8 @@
\setlength{\overfullrule}{\z@}%
\fi
}
-\KOMA@DeclareStandardOption{final}{draft=false}
+\KOMA@DeclareStandardOption
+{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
%%% From File: scrklang.dtx
@@ -3502,9 +3507,13 @@
}
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
- \list{}{\settowidth{\labelwidth}{#2#1}%
+ \list{}{\settowidth{\labelwidth}{{%
+ \usekomafont{labelinglabel}{#1%
+ \usekomafont{labelingseparator}{\sc@septext}}%
+ }}%
\leftmargin\labelwidth \advance\leftmargin by \labelsep
- \let\makelabel\labelinglabel}%
+ \let\makelabel\labelinglabel
+ }%
}{%
\endlist
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index b473e9da1f6..d731e1f02ef 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 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 9adeb39344a..f3cdd7d9503 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 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 8dca161adec..3c3faf3728a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -35,8 +35,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -60,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 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 332ddbc9578..f49e9cf42a7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -34,8 +34,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrtime.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index a696bbe8914..b186dabe9e4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -14,10 +14,10 @@
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3b of the license.
+%% the LaTeX Project Public License, version 1.3c of the license.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later and of this work.
%%
%% This work has the LPPL maintenance status "author-maintained".
@@ -246,13 +246,16 @@
\newcommand*{\@listoftoc}[2][\list@fname]{%
\begingroup
\@ifundefined{listof#2name}{%
- \PackageWarning{tocbasic}{%
- You should either define \expandafter\string\csname
- listof#2name\endcsname\MessageBreak
- or use the optional argument of \string\listoftoc\space\MessageBreak
- to set the term to be used for the\MessageBreak
- heading of list of #2}%
- \def\list@fname{\listofname~#2}%
+ \let\list@fname\relax
+ \ifx\relax#1\relax
+ \PackageWarning{tocbasic}{%
+ You should either define \expandafter\string\csname
+ listof#2name\endcsname\MessageBreak
+ or use the optional argument of \string\listoftoc\space\MessageBreak
+ to set the term to be used for the\MessageBreak
+ heading of list of #2}%
+ \def\list@fname{\listofname~#2}%
+ \fi
}{%
\expandafter\let\expandafter\list@fname\csname listof#2name\endcsname
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 69df0f5abe5..409a2f42b93 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -16,10 +16,10 @@
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3b of the license.
+%% the LaTeX Project Public License, version 1.3c of the license.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later and of this work.
%%
%% This work has the LPPL maintenance status "author-maintained".
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 24e09b20773..c882da7d9db 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -40,8 +40,10 @@
%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
%%% From File: scrkvers.dtx
\begingroup
@@ -65,7 +67,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}%
\endgroup
%%% From File: scrktare.dtx
\ProvidesPackage{typearea}[%
@@ -297,6 +299,7 @@
\KOMA@key{pagesize}[auto]{%
\begingroup
\KOMA@set@ncmdkey{pagesize}{@tempa}{%
+ {off}{-1},{no}{-1},{false}{-1},%
{auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3}%
}{#1}%
\ifcase\number\@tempa\relax
@@ -334,9 +337,14 @@
\endgroup
\AtBeginDocument{\AtBeginDvi{%
\special{papersize=\the\paperwidth,\the\paperheight}%
+ \if@seascape\special{! TeXDict begin /landplus90{true}store end }\fi
}%
}%
- \let\set@dvipspagesize=\setnot@dvipspagesize
+ \ifnum \scr@compatibility>\@nameuse{scr@v@3.02b}\relax
+ \let\set@dvipspagesize=\@empty
+ \else
+ \let\set@dvipspagesize=\setnot@dvipspagesize
+ \fi
\else
\endgroup
\fi
@@ -360,12 +368,57 @@
}%
\let\set@vtexpagesize=\@empty
}
+\newcommand*{\scr@updatedvipspagesize}{%
+ \special{ps::\@percentchar\@percentchar
+ PageBoundingBox: 0 0 \the\numexpr\paperwidth/\dimexpr 1bp\relax\relax
+ \space \the\numexpr\paperheight/\dimexpr 1bp\relax\relax^^J%
+ \@percentchar\@percentchar BeginPageSetup^^J%
+ << /PageSize [\the\numexpr\paperwidth/\dimexpr 1bp\relax\relax\space
+ \the\numexpr\paperheight/\dimexpr 1bp\relax\relax]
+ >> setpagedevice^^J%<<
+ 0 0 bop^^J%
+ \@percentchar\@percentchar EndPageSetup}%
+}
\AtBeginDocument{
\renewcommand*{\set@pdftexpagesize}{%
\ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}%
\ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}%
}%
- \let\set@dvipspagesize=\setnot@dvipspagesize
+ \ifnum \scr@compatibility>\@nameuse{scr@v@3.02b}\relax
+ \renewcommand*{\set@dvipspagesize}{%
+ \scr@ifundefinedorrelax{AtNextShipout}{%
+ \scr@ifundefinedorrelax{AtBeginShipoutNext}{%
+ \begingroup
+ \protected@edef\reserved@a{\endgroup
+ \scr@updatedvipspagesize}\reserved@a
+ }{%
+ \begingroup
+ \protected@edef\reserved@a{\endgroup
+ \protect\AtBeginShipoutNext{%
+ \protect\bgroup
+ \protect\global\protect\setbox\AtBeginShipoutBox\protect\vbox{%
+ \scr@updatedvipspagesize
+ \protect\box\AtBeginShipoutBox
+ }%
+ \protect\egroup
+ }}\reserved@a
+ }%
+ }{%
+ \begingroup
+ \protected@edef\reserved@a{\endgroup
+ \protect\AtNextShipout{%
+ \protect\bgroup
+ \protect\global\protect\setbox\protect\@cclv\protect\vbox{%
+ \scr@updatedvipspagesize
+ \protect\box\protect\@cclv
+ }%
+ \protect\egroup
+ }}\reserved@a
+ }%
+ }%
+ \else
+ \let\set@dvipspagesize=\setnot@dvipspagesize
+ \fi
\renewcommand*{\set@vtexpagesize}{%
\ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
\ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
@@ -386,7 +439,8 @@
\KOMA@DeclareStandardOption[typearea]{landscape}{paper=landscape}
\KOMA@DeclareStandardOption[typearea]{portrait}{paper=portrait}
\KOMA@key{paper}{%
- \ifstr{#1}{landscape}{%
+ \ifstr{#1}{seascape}{%
+ \@seascapetrue
\if@landscape\else
\setlength{\@tempdima}{\paperwidth}%
\setlength{\paperwidth}{\paperheight}%
@@ -394,73 +448,84 @@
\@landscapetrue
\fi
}{%
- \ifstr{#1}{portrait}{%
- \if@landscape
+ \ifstr{#1}{landscape}{%
+ \@seascapefalse
+ \if@landscape\else
\setlength{\@tempdima}{\paperwidth}%
\setlength{\paperwidth}{\paperheight}%
\setlength{\paperheight}{\@tempdima}%
- \@landscapefalse
+ \@landscapetrue
\fi
}{%
- \ifstr{#1}{letter}{%
+ \ifstr{#1}{portrait}{%
\if@landscape
- \setlength\paperheight{8.5in}%
- \setlength\paperwidth {11in}%
- \else
- \setlength\paperheight{11in}%
- \setlength\paperwidth {8.5in}%
+ \setlength{\@tempdima}{\paperwidth}%
+ \setlength{\paperwidth}{\paperheight}%
+ \setlength{\paperheight}{\@tempdima}%
+ \@landscapefalse
\fi
}{%
- \ifstr{#1}{legal}{%
+ \ifstr{#1}{letter}{%
\if@landscape
\setlength\paperheight{8.5in}%
- \setlength\paperwidth {14in}%
+ \setlength\paperwidth {11in}%
\else
- \setlength\paperheight{14in}%
+ \setlength\paperheight{11in}%
\setlength\paperwidth {8.5in}%
\fi
}{%
- \ifstr{#1}{executive}{%
+ \ifstr{#1}{legal}{%
\if@landscape
- \setlength\paperheight{7.25in}%
- \setlength\paperwidth {10.5in}%
+ \setlength\paperheight{8.5in}%
+ \setlength\paperwidth {14in}%
\else
- \setlength\paperheight{10.5in}%
- \setlength\paperwidth {7.25in}%
- \fi
+ \setlength\paperheight{14in}%
+ \setlength\paperwidth {8.5in}%
+ \fi
}{%
- \iso@paper{#1}%
- \if@tempswa\else
- \expandafter\maybe@pair#1::\@nil
- \if@tempswa
- \ifnum \scr@ta@compatibility<\@nameuse{scr@v@3.01b}\relax
- \PackageWarningNoLine{typearea}{%
- You may have to exchange height and width!\MessageBreak
- Until KOMA-Script version 3.01b the semantic\MessageBreak
- of option `paper' was `paper=height:width'\MessageBreak
- instead of `paper=width:height'.\MessageBreak
- I've switched back to that old interpretation\MessageBreak
- because of the given compatiblity settings}%
- \setlength\paperheight{\@tempa}%
- \setlength\paperwidth{\@tempb}%
+ \ifstr{#1}{executive}{%
+ \if@landscape
+ \setlength\paperheight{7.25in}%
+ \setlength\paperwidth {10.5in}%
+ \else
+ \setlength\paperheight{10.5in}%
+ \setlength\paperwidth {7.25in}%
+ \fi
+ }{%
+ \iso@paper{#1}%
+ \if@tempswa\else
+ \expandafter\maybe@pair#1::\@nil
+ \if@tempswa
+ \ifnum \scr@ta@compatibility<\@nameuse{scr@v@3.01b}\relax
+ \PackageWarningNoLine{typearea}{%
+ You may have to exchange height and width!\MessageBreak
+ Until KOMA-Script version 3.01b the semantic\MessageBreak
+ of option `paper' was `paper=height:width'\MessageBreak
+ instead of `paper=width:height'.\MessageBreak
+ I've switched back to that old interpretation\MessageBreak
+ because of the given compatiblity settings}%
+ \setlength\paperheight{\@tempa}%
+ \setlength\paperwidth{\@tempb}%
+ \else
+ \setlength\paperwidth{\@tempa}%
+ \setlength\paperheight{\@tempb}%
+ \fi
\else
- \setlength\paperwidth{\@tempa}%
- \setlength\paperheight{\@tempb}%
+ \KOMA@unknown@keyval{paper}{#1}{%
+ `letter', `legal', `executive', `a'<nr>, `b'<nr>,
+ `c'<nr>, `d'<nr>,\MessageBreak
+ <width>`:'<height>, `landscape' and `portrait'%
+ }%
\fi
- \else
- \KOMA@unknown@keyval{paper}{#1}{%
- `letter', `legal', `executive', `a'<nr>, `b'<nr>,
- `c'<nr>, `d'<nr>,\MessageBreak
- <width>`:'<height>, `landscape' and `portrait'%
- }%
\fi
- \fi
+ }%
}%
}%
}%
}%
}%
}
+\newif\if@seascape
\newif\if@landscape
\newcommand*{\maybe@pair}{}
\def\maybe@pair#1:#2:#3\@nil{%
@@ -531,7 +596,9 @@
\@namedef{scr@v@3.01c}{9}
\@namedef{scr@v@3.02}{9}
\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@last}{9}
+\@namedef{scr@v@3.02c}{10}
+\@namedef{scr@v@3.03}{0}
+\@namedef{scr@v@last}{10}
%%% From File: scrktare.dtx
\InputIfFileExists{typearea.cfg}{%
\typeout{%