summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-03-07 00:36:15 +0000
committerKarl Berry <karl@freefriends.org>2012-03-07 00:36:15 +0000
commit3c83ff430f9038fe824468a3a6df3cd66cff0016 (patch)
treeecb739f4be1b4e22130fd6c816d320643c3b9110 /Master/texmf-dist/tex/latex/koma-script
parent742ee4652adc1208821c470a0fb7cb97fbe82905 (diff)
koma-script (6mar12)
git-svn-id: svn://tug.org/texlive/trunk@25573 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak150
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls331
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty52
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls531
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdoc.cls4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty49
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty109
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlettr.cls2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls48
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls492
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrwfile.sty211
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty69
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco19
43 files changed, 1867 insertions, 387 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index aba7b08d84a..f0780b475f7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -8,7 +8,7 @@
%% scrklco.dtx (with options: `lco,DIN,head')
%% scrklco.dtx (with options: `lco,DIN,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 aa7b1d02d8a..7704b65deff 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -8,7 +8,7 @@
%% scrklco.dtx (with options: `lco,DINmoretext,head')
%% scrklco.dtx (with options: `lco,DINmoretext,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 d1b5919716c..a67c8fed731 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -9,7 +9,7 @@
%% scrklco.dtx (with options: `lco,KOMAold,body')
%% scrknpap.dtx (with options: `lco,KOMAold,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 4af891261a7..ac6668b8ccd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 58c65dc4f0a..e2f6501fe15 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -8,7 +8,7 @@
%% scrklco.dtx (with options: `lco,NF,head')
%% scrklco.dtx (with options: `lco,NF,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 a4955e865c9..89988f40159 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 0fa0e1962a4..09bd3b3d6ad 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 f3ce7da56bf..e9281f8066d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 c30e86f7f93..c7250f20cb4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 da5e8cd4529..917fd91d104 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 bfdfccda6dd..f781e7777f7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -8,7 +8,7 @@
%% scrklco.dtx (with options: `lco,SN,head')
%% scrklco.dtx (with options: `lco,SN,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 1292ed12a95..a281d13953c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -8,7 +8,7 @@
%% scrklco.dtx (with options: `lco,SwissLeft,head')
%% scrklco.dtx (with options: `lco,SwissLeft,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 cc5bd1616be..051f4deafbe 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -9,7 +9,7 @@
%% scrbeta.dtx (with options: `UScommercial9,betarelease,lco')
%% scrklco.dtx (with options: `lco,UScommercial9,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 8c1a94db26d..1cf49cdc0db 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -9,7 +9,7 @@
%% scrbeta.dtx (with options: `UScommercial9DW,betarelease,lco')
%% scrklco.dtx (with options: `lco,UScommercial9DW,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index a2737069c51..a54625b9cb1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -4,10 +4,11 @@
%%
%% The original source files were:
%%
+%% scrkvers.dtx (with options: `file,float.hak')
%% scrhack.dtx (with options: `hack,float,identify')
%% scrhack.dtx (with options: `hack,float,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -40,6 +41,30 @@
%% 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{2012/01/01 v3.10 KOMA-Script}%
+\endgroup
%%% From File: scrhack.dtx
\ProvidesFile{float.hak}
[\KOMAScriptVersion\space
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
new file mode 100644
index 00000000000..4c81e97cdc8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -0,0 +1,150 @@
+%%
+%% This is file `floatrow.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrkvers.dtx (with options: `file,floatrow.hak')
+%% scrhack.dtx (with options: `hack,floatrow,identify')
+%% scrhack.dtx (with options: `hack,floatrow,body')
+%%
+%% Copyright (c) 1994-2012
+%% Markus Kohm and any individual authors listed elsewhere in this file.
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%%
+%%% From File: scrkvers.dtx
+\begingroup
+ \makeatletter
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
+\endgroup
+%%% From File: scrhack.dtx
+\ProvidesFile{floatrow.hak}
+ [\KOMAScriptVersion\space
+ hacking package
+ floatrow]
+%%% From File: scrhack.dtx
+\scr@ifexpected{\DeclareNewFloatType}{%
+ \long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}%
+ \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
+ \addtocounter{float@type}{\value{float@type}}%
+ \@namedef{#1name}{#1}\newcounter{#1}%
+ \expandafter\edef\csname fnum@#1\endcsname
+ {\expandafter\noexpand\csname #1name\endcsname\nobreakspace
+ \expandafter\noexpand\csname the#1\endcsname}%
+ \@namedef{the#1}{\arabic{#1}}\flnew@ext{lo#1}\@namedef{fps@#1}{tbp}%
+ \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}%
+ \caption@setkeys[floatrow]{newfloat}{#2}\let\FR@tmp=\relax
+ \xdef\@tempa{\noexpand\flrow@types{\the\flrow@types \FR@tmp{#1}}}%
+ \@tempa}%
+}{%
+ \scr@ifexpected{\listof}{%
+ \def\listof#1#2{%
+ \@ifundefined{ext@#1}{\flrow@error{Unknown float style `#1'}}{%
+ \expandafter\providecommand\csname l@#1\endcsname
+ {\@dottedtocline{1}{1.5em}{2.3em}}%
+ \float@listhead{#2}%
+ \begingroup\setlength{\parskip}{\z@}%
+ \@starttoc{\@nameuse{ext@#1}}%
+ \endgroup}}%
+ }{%
+ \RequirePackage{tocbasic}%
+ \PackageInfo{scrhack}{redefining \string\DeclareNewFloatType}%
+ \renewcommand\DeclareNewFloatType[2]{\def\FB@captype{#1}%
+ \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
+ \addtocounter{float@type}{\value{float@type}}%
+ \@namedef{#1name}{#1}\newcounter{#1}%
+ \expandafter\edef\csname fnum@#1\endcsname
+ {\expandafter\noexpand\csname #1name\endcsname\nobreakspace
+ \expandafter\noexpand\csname the#1\endcsname}%
+ \@namedef{the#1}{\arabic{#1}}\flnew@ext{lo#1}\@namedef{fps@#1}{tbp}%
+ \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}%
+ \caption@setkeys[floatrow]{newfloat}{#2}\let\FR@tmp=\relax
+ \xdef\@tempa{\noexpand\flrow@types{\the\flrow@types \FR@tmp{#1}}}%
+ \@tempa
+ \xdef\@tempa{\noexpand\addtotoclist[float]{\@nameuse{ext@\FB@captype}}%
+ \noexpand\setuptoc{\@nameuse{ext@\FB@captype}}{chapteratlist}%
+ }%
+ \@tempa
+ }%
+ \PackageInfo{scrhack}{redefining \string\listof}%
+ \renewcommand*\listof[2]{%
+ \@ifundefined{ext@#1}{\flrow@error{Unknown float style `#1'}}{%
+ \@ifundefined{l@#1}{\expandafter\let\csname l@#1\endcsname\l@figure
+ \@ifundefined{l@#1}{%
+ \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}}{}%
+ }{}%
+ \listoftoc[{#2}]{\csname ext@#1\endcsname}%
+ }%
+ }%
+ \scr@ifexpected{\float@addtolists}{%
+ \long\def\float@addtolists#1{%
+ \def\float@do##1{\addtocontents{##1}{#1}} \the\float@exts}%
+ }{%
+ \PackageInfo{scrhack}{undefining \string\float@addtolists}%
+ \let\float@addtolists\relax
+ }{%
+ \PackageWarningNoLine{scrhack}{unkown \string\float@addtolists\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported floatrow version}%
+ }%
+ }{%
+ \PackageWarningNoLine{scrhack}{unknown \string\listof\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported floatrow version}%
+ }%
+}{%
+ \PackageWarningNoLine{scrhack}{unknown \string\DeclareNewFloatType\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported floatrow version}%
+}
+\endinput
+%%
+%% End of file `floatrow.hak'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index 5ba91af4c9e..d998dce58f6 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -4,10 +4,11 @@
%%
%% The original source files were:
%%
+%% scrkvers.dtx (with options: `file,hyperref.hak')
%% scrhack.dtx (with options: `hack,hyperref,identify')
%% scrhack.dtx (with options: `hack,hyperref,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -40,6 +41,30 @@
%% 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{2012/01/01 v3.10 KOMA-Script}%
+\endgroup
%%% From File: scrhack.dtx
\ProvidesFile{hyperref.hak}
[\KOMAScriptVersion\space
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index fcfaff85af2..5da33bf98b3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -4,10 +4,11 @@
%%
%% The original source files were:
%%
+%% scrkvers.dtx (with options: `file,listings.hak')
%% scrhack.dtx (with options: `hack,listings,identify')
%% scrhack.dtx (with options: `hack,listings,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -40,6 +41,30 @@
%% 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{2012/01/01 v3.10 KOMA-Script}%
+\endgroup
%%% From File: scrhack.dtx
\ProvidesFile{listings.hak}
[\KOMAScriptVersion\space
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index 422fd9aefd2..aa34e3e384a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
@@ -7,7 +7,7 @@
%% scraddr.dtx (with options: `scraddr')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 3378a6edbd1..39f9eece68a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -40,7 +40,7 @@
%% scrklist.dtx (with options: `class,article,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -185,6 +185,7 @@
\@namedef{scr@v@3.08b}{10}
\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@3.09a}{10}
+\@namedef{scr@v@3.10}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -511,7 +512,10 @@
\KOMA@set@ncmdkey{headings}{@tempa}{%
{big}{0},%
{normal}{1},%
- {small}{2}%
+ {small}{2},%
+ {optiontotocandhead}{10},{optiontoheadandtoc}{10},%
+ {optiontotoc}{11},%
+ {optiontohead}{12}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*{\size@part}{\Huge}%
@@ -544,11 +548,21 @@
\or
\or
\or
+ \or
+ \scr@activate@xsection{3}%
+ \or
+ \scr@activate@xsection{2}%
+ \or
+ \scr@activate@xsection{1}%
\fi
}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
+\newcommand*{\scr@osectarg}{0}
+\newcommand*{\scr@activate@xsection}[1]{%
+ \renewcommand*{\scr@osectarg}{#1}%
+}
%%% From File: scrkpage.dtx
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
@@ -706,7 +720,7 @@
\fi
\ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
- \let\FN@mf@prepare\scr@mf@prepare
+ \def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
@@ -917,7 +931,7 @@
\scr@bibstyle@oldstyle
\newcommand*\bib@heading{%
\section*{\refname}%
- \@mkboth{\refname}{\refname}%
+ \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
}
\KOMA@key{bibliography}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -931,17 +945,18 @@
\ifcase \@tempa\relax
\renewcommand*\bib@heading{%
\section*{\refname}%
- \@mkboth{\refname}{\refname}%
+ \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
}%
\or% totoc
\renewcommand*\bib@heading{%
\addsec{\refname}%
- \@mkboth{\refname}{\refname}%
+ \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
}%
\or% numbered
\renewcommand*\bib@heading{%
\section{\refname}%
- \@mkboth{\sectionmarkformat \refname}{\sectionmarkformat \refname}%
+ \@mkboth{\MakeMarkcase{\sectionmarkformat \refname}}%
+ {\MakeMarkcase{\sectionmarkformat \refname}}%
}
\fi
}{%
@@ -1277,19 +1292,30 @@
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
\setlength{\columnseprule}{\z@}
-\newcommand*{\scr@selectfont}{}\let\scr@selectfont\selectfont
+\newcommand*{\scr@selectfont}{}
+\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
\BeforePackage{everysel}{%
- \ifx\selectfont\scr@new@selectfont\else
- \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
- \fi
- \let\selectfont\scr@selectfont
+ \AtBeginDocument{%
+ \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else
+ \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
+ \fi
+ \expandafter\let\csname selectfont \endcsname\scr@selectfont
+ }%
}
\AfterPackage{everysel}{%
- \g@addto@macro\selectfont{\par@update}%
- \let\scr@new@selectfont\selectfont
+ \g@addto@macro\@EverySelectfont@Init{%
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
+ }%
}
-\g@addto@macro\selectfont{\par@update}
-\newcommand*{\scr@new@selectfont}{}\let\scr@new@selectfont\selectfont
+\AfterPackage{tracefnt}{%
+ \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
+}
+\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}
+\newcommand*{\scr@new@selectfont}{}
+\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
\newcommand*{\par@updaterelative}{%
\begingroup
\edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent
@@ -1651,11 +1677,129 @@
\fi
\@@maybeautodot
}
-\let\scr@sect\@sect
-\renewcommand*{\@sect}[1]{\stepcounter{#1}%
- \expandafter\@maybeautodot\csname the#1\endcsname
- \addtocounter{#1}{-1}\scr@sect{#1}%
-}
+\def\@tempa#1#2#3#4#5#6[#7]#8{%
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \begingroup
+ #6{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #8\@@par}%
+ \endgroup
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else
+ \protect\numberline{\csname the#1\endcsname}%
+ \fi
+ #7}%
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax
+ \@svsec #8}%
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else
+ \protect\numberline{\csname the#1\endcsname}%
+ \fi
+ #7}}%
+ \fi
+ \@xsect{#5}}
+\ifx\@sect\@tempa\else
+ \ClassWarning{\KOMAClassName}{%
+ Unexpected definition of \string\@sect!\MessageBreak
+ Please send an information about this to\MessageBreak
+ the KOMA-Script maintainer!\MessageBreak
+ Maybe LaTeX will be broken by the redefinition\MessageBreak
+ of \string\@sect\space}%
+\fi
+\def\@sect#1#2#3#4#5#6[#7]#8{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#7=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#8},head={#8},#7}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#8},head={#7}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#8}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}%
+ \fi
+ \fi
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \expandafter\@maybeautodot\csname the#1\endcsname
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \begingroup
+ #6{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #8\@@par}%
+ \endgroup
+ \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \expandafter\global\expandafter\def
+ \csname add#1tocentry\endcsname##1##2{%
+ \addtocentrydefault{#1}{##1}{##2}%
+ }%
+ }{}%
+ \ifnum #2>\c@secnumdepth
+ \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
+ \else
+ \csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
+ \scr@ds@tocentry}%
+ \fi
+ \fi
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax
+ \@svsec #8}%
+ \expandafter\csname #1mark\expandafter\endcsname\expandafter{%
+ \scr@ds@head}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \expandafter\global\expandafter\def
+ \csname add#1tocentry\endcsname####1####2{%
+ \addtocentrydefault{#1}{####1}{####2}%
+ }%
+ }{}%
+ \ifnum #2>\c@secnumdepth
+ \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
+ \else
+ \csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
+ \scr@ds@tocentry}%
+ \fi
+ \fi
+ }%
+ \fi
+ \@xsect{#5}%
+}
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.section]{KOMAarg}
+\DefineFamilyKey[.section]{KOMAarg}{tocentry}{\def\scr@ds@tocentry{#1}}
+\DefineFamilyKey[.section]{KOMAarg}{head}{\def\scr@ds@head{#1}}
+\newcommand*\scr@ds@tocentry{}
+\newcommand*\scr@ds@head{}
+\newcommand*{\scr@istest}{}
+\def\scr@istest#1=#2\@nil{%
+ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
+}
+\newif\if@scr@tempswa
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
\string\global\string\@altsecnumformattrue}%
@@ -1705,12 +1849,34 @@
}
\newcommand*{\@part}{}
\def\@part[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
\ifnum \c@secnumdepth >\m@ne
\refstepcounter{part}%
\@maybeautodot\thepart%
- \addparttocentry{\thepart}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addparttocentry{\thepart}{\scr@ds@tocentry}%
+ \fi
\else
- \addparttocentry{}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addparttocentry{}{\scr@ds@tocentry}%
+ \fi
\fi
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -1721,8 +1887,12 @@
\size@partnumber{\partformat}%
\partheadmidvskip
\fi
- \size@part{#2}\strut%
- \partmark{#1}\par
+ \size@part{#2}\strut
+ \ifx\partmark\@gobble
+ \@mkboth{}{}\par
+ \else
+ \expandafter\partmark\expandafter{\scr@ds@head}\par
+ \fi
\endgroup
\nobreak
\partheadendvskip
@@ -1745,26 +1915,90 @@
}
\newcommand\addpart{%
\par
- \partheadstartvskip%
+ \partheadstartvskip
\@afterindentfalse
\secdef\@addpart\@saddpart
}
\newcommand*{\@addpart}{}
\def\@addpart[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
\csname phantomsection\endcsname
- \addparttocentry{}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{%
+ \scr@ds@tocentry}%
\@spart{#2}%
- \ifx\partmark\@gobble\else\@mkboth{#1}{}\fi
+ \ifx\partmark\@gobble
+ \@mkboth{}{}%
+ \else
+ \expandafter\@mkboth\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
+ \fi
}
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
\newcommand*\addsec{\secdef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
-\def\@addsec[#1]#2{\section*{#2}\addcontentsline{toc}{section}{#1}
- \if@twoside \@mkboth{#1}{}\else \@mkboth{#1}{#1}\fi
+\def\@addsec[#1]#2{\section*{#2}%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
+ \ifx\scr@ds@tocentry\@empty\else
+ \addsectiontocentry{}{\scr@ds@tocentry}%
+ \fi
+ \if@twoside
+ \expandafter\@mkboth\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
+ \else
+ \expandafter\@mkboth\expandafter{\expandafter}\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}%
+ \fi
}
\newcommand*{\@saddsec}[1]{\section*{#1}\@mkboth{}{}}
+\newcommand*{\addsectiontocentry}[2]{%
+ \addtocentrydefault{section}{#1}{#2}%
+}
+\newcommand*{\addsubsectiontocentry}[2]{%
+ \addtocentrydefault{subsection}{#1}{#2}%
+}
+\newcommand*{\addparagraphtocentry}[2]{%
+ \addtocentrydefault{paragraph}{#1}{#2}%
+}
+\newcommand*{\addsubparagraphtocentry}[2]{%
+ \addtocentrydefault{subparagraph}{#1}{#2}%
+}
\newcommand\section{\@startsection{section}{1}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
@@ -1920,7 +2154,7 @@
\raggeddictum\parbox{\dictumwidth}{%
{\@dictumfont{\raggeddictumtext #2\strut\par}%
\def\@tempa{#1}\ifx\@tempa\@empty\else%
- {\raggeddictumtext\vskip-1ex\hrulefill\par}%
+ {\raggeddictumtext\dictumrule}%
\raggeddictumauthor\@dictumauthorfont\dictumauthorformat{#1}%
\strut\par%
\fi%
@@ -1928,6 +2162,7 @@
}\par%
\endgroup
}
+\newcommand*{\dictumrule}{\vskip-1ex\hrulefill\par}%
\newcommand*{\dictumwidth}{.3333\textwidth}
\newcommand*{\raggeddictum}{\raggedleft}
\newcommand*{\dictumauthorformat}[1]{(#1)}
@@ -1980,7 +2215,7 @@
\DeclareRobustCommand*\textsubscript[1]{%
\@textsubscript{\selectfont#1}%
}
-\newcommand{\@textsubscript}[1]{%
+\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
%%% From File: scrkpage.dtx
@@ -2040,12 +2275,12 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ##1}{}}%
+ {\MakeMarkcase{\ifnum \c@secnumdepth >\z@%
+ \sectionmarkformat\fi ##1}}{}}%
\renewcommand*{\subsectionmark}[1]{%
\if@twoside
- \markright{\ifnum \c@secnumdepth >\@ne%
- \subsectionmarkformat\fi ##1}%
+ \markright{\MakeMarkcase{\ifnum \c@secnumdepth >\@ne%
+ \subsectionmarkformat\fi ##1}}%
\fi
}%
}%
@@ -2570,6 +2805,12 @@
\newcommand*{\captionaboveof}{\@captionabovetrue\captionof}
\newcommand*{\captionbelowof}{\@captionabovefalse\captionof}
\BeforePackage{capt-of}{\let\captionof\relax}
+\newenvironment{captionofbeside}[1]{%
+ \def\@captype{#1}%
+ \captionbeside
+}{%
+ \endcaptionbeside
+}
\newcommand*\figurename{Figure}
\newcommand*\tablename{Table}
\newcounter{figure}
@@ -2735,6 +2976,16 @@
\fi
\let\@footnotetext\scr@saved@footnotetext
}
+\BeforePackage{setspace}{%
+ \let\@footnotetext\scr@saved@footnotetext
+}
+\AfterPackage{setspace}{%
+ \let\scr@saved@footnotetext\@footnotetext
+ \renewcommand{\@footnotetext}[1]{%
+ \scr@saved@footnotetext{#1}%
+ \csname FN@mf@prepare\endcsname
+ }%
+}
\newcommand*{\multiplefootnoteseparator}{%
\begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup
}
@@ -2815,7 +3066,7 @@
KOMA-Script soon, so it should not be used
}%
\section*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
+ \@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}%
}
\newcommand*{\toc@l@number}{}
\newcommand*{\tableofcontents}{%
@@ -2831,7 +3082,7 @@
\newcommand*{\float@listhead}[1]{%
\scr@float@listhead@warning
\float@@listhead{#1}%
- \@mkboth{#1}{#1}%
+ \@mkboth{\MakeMarkcase{#1}}{\MakeMarkcase{#1}}%
\if@dynlist%
\newcommand*{\scr@starttoc}{}%
\let\scr@starttoc=\@starttoc
@@ -2961,7 +3212,7 @@
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
\newcommand*{\idx@heading}{%
\twocolumn[\idx@@heading{\indexname}]%
- \@mkboth{\indexname}{\indexname}%
+ \@mkboth{\MakeMarkcase{\indexname}}\MakeMarkcase{{\indexname}}%
}
\newenvironment{theindex}{%
\if@twocolumn
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 904c702015f..79fe9d1c2de 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -12,7 +12,7 @@
%% scrklang.dtx (with options: `package,body,base')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -67,7 +67,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -169,6 +169,7 @@
\let\@globaloptionslist\XKV@classoptionslist
\fi
}
+\newcommand*{\scr@removeunused}{}
\newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{%
\let\ds@\@empty
\edef\@curroptions{\@ptionlist{\@currname.\@currext}}%
@@ -180,16 +181,20 @@
\@use@ption
\expandafter\let\csname ds@\CurrentOption\endcsname\@empty
\else
+ \expandafter\def\expandafter\scr@removeunused\expandafter{%
+ \expandafter\def\expandafter\CurrentOption\expandafter{%
+ \CurrentOption}\@use@ption}%
\scr@optiontest{#2}\CurrentOption{}{%
- \@use@ption
\@expandtwoargs\setkeys{#2}%
\CurrentOption
+ \scr@removeunused
}%
\scr@optiontest{#2#1}\CurrentOption{}{%
- \@use@ption
\@expandtwoargs\setkeys{#2#1}%
\CurrentOption
+ \scr@removeunused
}%
+ \let\scr@removeunused\@empty
\fi
\fi
}%
@@ -300,6 +305,7 @@
the manual of every package you are using\@gobble
}%
\fi
+ \ignorespaces
}%
\fi
}{%
@@ -641,18 +647,32 @@
}%
}
\newcommand*{\FamilyUnknownKeyValue}[4]{%
- \PackageError{%
- scrbase%
- }{%
- option `#2' of family `#1' has no value `#3'%
- }{%
- You've tried to set option `#2' of family '#1' to value `#3'.\MessageBreak
- But allowed values are only:\MessageBreak
- #4\FamilyElseValues.\MessageBreak
- See the manual of the class or package, that provides family
- `#1'\MessageBreak
- for more information about options and their values.%
- }%
+ \ifx\scr@removeunused\@empty
+ \PackageError{%
+ scrbase%
+ }{%
+ option `#2' of family `#1' has no value `#3'%
+ }{%
+ You've tried to set option `#2' of family '#1' to value `#3'.\MessageBreak
+ But allowed values are only:\MessageBreak
+ #4\FamilyElseValues.\MessageBreak
+ See the manual of the class or package, that provides family
+ `#1'\MessageBreak
+ for more information about options and their values.%
+ }%
+ \else
+ \let\scr@removeunused\@empty
+ \PackageInfo{%
+ scrbase%
+ }{%
+ option `#2' of family `#1' has no value `#3'.\MessageBreak
+ Allowed values for option `#2' of family `#1'\MessageBreak
+ would be:\MessageBreak
+ #4\FamilyElseValues.\MessageBreak
+ Maybe another class or package provides this option.\MessageBreak
+ Global option ignored
+ }%
+ \fi
}
\newcommand*{\FamilyElseValues}{}
\newcommand*{\FamilyBoolKey}[4][.\@currname.\@currext]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index cf35d07efdc..60ece4d03b8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -40,7 +40,7 @@
%% scrklist.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -187,6 +187,7 @@
\@namedef{scr@v@3.08b}{10}
\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@3.09a}{10}
+\@namedef{scr@v@3.10}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -544,18 +545,21 @@
\KOMA@set@ncmdkey{headings}{@tempa}{%
{big}{0},%
{normal}{1},%
- {small}{2}%
- ,{openany}{3},%
+ {small}{2},%
+ {openany}{3},%
{openright}{4},%
- {openleft}{5}%
- ,{twolinechapter}{6},{chapterprefix}{6},{chapterwithprefix}{6},%
+ {openleft}{5},%
+ {twolinechapter}{6},{chapterprefix}{6},{chapterwithprefix}{6},%
{chapterwithprefixline}{6},%
{onelinechapter}{7},{nochapterprefix}{7},{chapterwithoutprefix}{7},%
- {chapterwithoutprefixline}{7}%
- ,{twolineappendix}{8},{appendixprefix}{8},{appendixwithprefix}{8},%
+ {chapterwithoutprefixline}{7},%
+ {twolineappendix}{8},{appendixprefix}{8},{appendixwithprefix}{8},%
{appendixwithprefixline}{8},%
{onelineappendix}{9},{noappendixprefix}{9},{appendixwithoutprefix}{9},%
- {appendixwithoutprefixline}{9}%
+ {appendixwithoutprefixline}{9},%
+ {optiontotocandhead}{10},{optiontoheadandtoc}{10},%
+ {optiontotoc}{11},%
+ {optiontohead}{12}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*{\chapterheadstartvskip}{%
@@ -619,11 +623,21 @@
\KOMA@options{appendixprefix=true}{}%
\or
\KOMA@options{appendixprefix=false}{}%
+ \or
+ \scr@activate@xsection{3}%
+ \or
+ \scr@activate@xsection{2}%
+ \or
+ \scr@activate@xsection{1}%
\fi
}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
+\newcommand*{\scr@osectarg}{0}
+\newcommand*{\scr@activate@xsection}[1]{%
+ \renewcommand*{\scr@osectarg}{#1}%
+}
%%% From File: scrkpage.dtx
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
@@ -781,7 +795,7 @@
\fi
\ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
- \let\FN@mf@prepare\scr@mf@prepare
+ \def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
@@ -1013,7 +1027,7 @@
\scr@bibstyle@oldstyle
\newcommand*\bib@heading{%
\chapter*{\bibname}%
- \@mkboth{\bibname}{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
}
\KOMA@key{bibliography}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1027,17 +1041,18 @@
\ifcase \@tempa\relax
\renewcommand*\bib@heading{%
\chapter*{\bibname}%
- \@mkboth{\bibname}{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
}%
\or% totoc
\renewcommand*\bib@heading{%
\addchap{\bibname}%
- \@mkboth{\bibname}{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
}%
\or% numbered
\renewcommand*\bib@heading{%
\chapter{\bibname}%
- \@mkboth{\chaptermarkformat \bibname}{\chaptermarkformat \bibname}%
+ \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
+ {\MakeMarkcase{\chaptermarkformat \bibname}}%
}
\fi
}{%
@@ -1378,19 +1393,30 @@
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
\setlength{\columnseprule}{\z@}
-\newcommand*{\scr@selectfont}{}\let\scr@selectfont\selectfont
+\newcommand*{\scr@selectfont}{}
+\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
\BeforePackage{everysel}{%
- \ifx\selectfont\scr@new@selectfont\else
- \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
- \fi
- \let\selectfont\scr@selectfont
+ \AtBeginDocument{%
+ \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else
+ \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
+ \fi
+ \expandafter\let\csname selectfont \endcsname\scr@selectfont
+ }%
}
\AfterPackage{everysel}{%
- \g@addto@macro\selectfont{\par@update}%
- \let\scr@new@selectfont\selectfont
+ \g@addto@macro\@EverySelectfont@Init{%
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
+ }%
+}
+\AfterPackage{tracefnt}{%
+ \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
}
-\g@addto@macro\selectfont{\par@update}
-\newcommand*{\scr@new@selectfont}{}\let\scr@new@selectfont\selectfont
+\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}
+\newcommand*{\scr@new@selectfont}{}
+\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
\newcommand*{\par@updaterelative}{%
\begingroup
\edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent
@@ -1734,11 +1760,129 @@
\fi
\@@maybeautodot
}
-\let\scr@sect\@sect
-\renewcommand*{\@sect}[1]{\stepcounter{#1}%
- \expandafter\@maybeautodot\csname the#1\endcsname
- \addtocounter{#1}{-1}\scr@sect{#1}%
-}
+\def\@tempa#1#2#3#4#5#6[#7]#8{%
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \begingroup
+ #6{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #8\@@par}%
+ \endgroup
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else
+ \protect\numberline{\csname the#1\endcsname}%
+ \fi
+ #7}%
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax
+ \@svsec #8}%
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else
+ \protect\numberline{\csname the#1\endcsname}%
+ \fi
+ #7}}%
+ \fi
+ \@xsect{#5}}
+\ifx\@sect\@tempa\else
+ \ClassWarning{\KOMAClassName}{%
+ Unexpected definition of \string\@sect!\MessageBreak
+ Please send an information about this to\MessageBreak
+ the KOMA-Script maintainer!\MessageBreak
+ Maybe LaTeX will be broken by the redefinition\MessageBreak
+ of \string\@sect\space}%
+\fi
+\def\@sect#1#2#3#4#5#6[#7]#8{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#7=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#8},head={#8},#7}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#8},head={#7}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#8}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}%
+ \fi
+ \fi
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \expandafter\@maybeautodot\csname the#1\endcsname
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \begingroup
+ #6{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #8\@@par}%
+ \endgroup
+ \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \expandafter\global\expandafter\def
+ \csname add#1tocentry\endcsname##1##2{%
+ \addtocentrydefault{#1}{##1}{##2}%
+ }%
+ }{}%
+ \ifnum #2>\c@secnumdepth
+ \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
+ \else
+ \csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
+ \scr@ds@tocentry}%
+ \fi
+ \fi
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax
+ \@svsec #8}%
+ \expandafter\csname #1mark\expandafter\endcsname\expandafter{%
+ \scr@ds@head}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \expandafter\global\expandafter\def
+ \csname add#1tocentry\endcsname####1####2{%
+ \addtocentrydefault{#1}{####1}{####2}%
+ }%
+ }{}%
+ \ifnum #2>\c@secnumdepth
+ \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
+ \else
+ \csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
+ \scr@ds@tocentry}%
+ \fi
+ \fi
+ }%
+ \fi
+ \@xsect{#5}%
+}
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.section]{KOMAarg}
+\DefineFamilyKey[.section]{KOMAarg}{tocentry}{\def\scr@ds@tocentry{#1}}
+\DefineFamilyKey[.section]{KOMAarg}{head}{\def\scr@ds@head{#1}}
+\newcommand*\scr@ds@tocentry{}
+\newcommand*\scr@ds@head{}
+\newcommand*{\scr@istest}{}
+\def\scr@istest#1=#2\@nil{%
+ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
+}
+\newif\if@scr@tempswa
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
\string\global\string\@altsecnumformattrue}%
@@ -1835,12 +1979,34 @@
}
\newcommand*{\@part}{}
\def\@part[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
\@maybeautodot\thepart%
- \addparttocentry{\thepart}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addparttocentry{\thepart}{\scr@ds@tocentry}%
+ \fi
\else
- \addparttocentry{}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addparttocentry{}{\scr@ds@tocentry}%
+ \fi
\fi
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -1851,8 +2017,12 @@
\size@partnumber{\partformat}%
\partheadmidvskip
\fi
- \size@part{#2}\strut%
- \partmark{#1}\par
+ \size@part{#2}\strut
+ \ifx\partmark\@gobble
+ \@mkboth{}{}\par
+ \else
+ \expandafter\partmark\expandafter{\scr@ds@head}\par
+ \fi
\endgroup
\@endpart
}
@@ -1891,10 +2061,35 @@
}
\newcommand*{\@addpart}{}
\def\@addpart[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
\csname phantomsection\endcsname
- \addparttocentry{}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{%
+ \scr@ds@tocentry}%
\@spart{#2}%
- \ifx\partmark\@gobble\else\@mkboth{#1}{}\fi
+ \ifx\partmark\@gobble
+ \@mkboth{}{}%
+ \else
+ \expandafter\@mkboth\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
+ \fi
}
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
@@ -1942,79 +2137,107 @@
\secdef\@chapter\@schapter
}
\newcommand*{\@chapter}{}
-\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+\def\@chapter[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
+ \ifnum \c@secnumdepth >\m@ne
\if@mainmatter
\refstepcounter{chapter}%
\@maybeautodot\thechapter
\typeout{\@chapapp\space\thechapter.}%
- \addchaptertocentry{\thechapter}{#1}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{%
- \protect\numberline{\thechapter}#1}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}#1}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}#1}{\thepage}{\@currentHref}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addcontentsline{\@currext}{chapteratlist}{%
+ \protect\numberline{\thechapter}\scr@ds@tocentry}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{%
+ \scr@float@addtolists@warning
+ \scr@ifundefinedorrelax{@currentHref}{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{%
+ \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}%
+ }%
+ }{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{%
+ \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}{%
+ \@currentHref}%
+ }%
}%
}%
- }%
+ \fi
\fi
\else
- \addchaptertocentry{}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addchaptertocentry{}{#1}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addcontentsline{\@currext}{chapteratlist}{#1}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{%
+ \scr@float@addtolists@warning
+ \scr@ifundefinedorrelax{@currentHref}{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{#1}{\thepage}%
+ }%
+ }{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{#1}{\thepage}{%
+ \@currentHref}%
+ }%
+ }%
+ }%
+ \fi
+ \fi
+ \fi
+ \else
+ \ifx\scr@ds@tocentry\@empty\else
+ \addchaptertocentry{}{\scr@ds@tocentry}%
\if@chaptertolists
\doforeachtocfile{%
\iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{#1}%
+ \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
}{}%
}%
\@ifundefined{float@addtolists}{}{%
\scr@float@addtolists@warning
\scr@ifundefinedorrelax{@currentHref}{%
\float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
}%
}{%
\float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}{\@currentHref}%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
+ \@currentHref}%
}%
}%
}%
\fi
\fi
- \else
- \addchaptertocentry{}{#1}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{#1}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}{\@currentHref}%
- }%
- }%
- }%
- \fi
\fi
- \chaptermark{#1}%
+ \expandafter\chaptermark\expandafter{\scr@ds@head}%
\ifdim \@chapterlistsgap>\z@
\doforeachtocfile{%
\iftocfeature{\@currext}{chapteratlist}{%
@@ -2095,33 +2318,56 @@
\@@makeschapterhead{#1}%
\use@preamble{chapter@u}\nobreak
}
-\newcommand\addchap{\if@openright\cleardoublepage\else\clearpage\fi
+\newcommand\addchap{%
+ \if@openright\cleardoublepage\else\clearpage\fi
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
\secdef\@addchap\@saddchap%
}%
\newcommand*{\@addchap}{}%
-\def\@addchap[#1]#2{\@schapter{#2}%
- \addchaptertocentry{}{#1}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{#1}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}{\@currentHref}%
+\def\@addchap[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
+ \@schapter{#2}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addchaptertocentry{}{\scr@ds@tocentry}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{%
+ \scr@float@addtolists@warning
+ \scr@ifundefinedorrelax{@currentHref}{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
+ }%
+ }{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
+ \@currentHref}%
+ }%
}%
}%
- }%
+ \fi
\fi
\ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax
\ifdim \@chapterlistsgap>\z@
@@ -2136,7 +2382,13 @@
}%
\fi
\fi
- \if@twoside\@mkboth{#1}{}\else\@mkboth{}{#1}\fi
+ \if@twoside
+ \expandafter\@mkboth\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
+ \else
+ \expandafter\@mkboth\expandafter{\expandafter}\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}%
+ \fi
}%
\newcommand*{\@saddchap}[1]{\@schapter{#1}\@mkboth{}{}}%
\AfterPackage{hyperref}{%
@@ -2149,10 +2401,48 @@
6.71b}}}
\newcommand*\addsec{\secdef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
-\def\@addsec[#1]#2{\section*{#2}\addcontentsline{toc}{section}{#1}
- \if@twoside\ifx\@mkboth\markboth\markright{#1}\fi\fi
+\def\@addsec[#1]#2{\section*{#2}%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
+ \ifx\scr@ds@tocentry\@empty\else
+ \addsectiontocentry{}{\scr@ds@tocentry}%
+ \fi
+ \if@twoside
+ \ifx\@mkboth\markboth
+ \expandafter\markright\expandafter{%
+ \expandafter\MakeMarkcase{\scr@ds@head}}%
+ \fi
+ \fi
}
\newcommand*{\@saddsec}[1]{\section*{#1}\@mkboth{}{}}
+\newcommand*{\addsectiontocentry}[2]{%
+ \addtocentrydefault{section}{#1}{#2}%
+}
+\newcommand*{\addsubsectiontocentry}[2]{%
+ \addtocentrydefault{subsection}{#1}{#2}%
+}
+\newcommand*{\addparagraphtocentry}[2]{%
+ \addtocentrydefault{paragraph}{#1}{#2}%
+}
+\newcommand*{\addsubparagraphtocentry}[2]{%
+ \addtocentrydefault{subparagraph}{#1}{#2}%
+}
\newcommand\section{\@startsection{section}{1}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
@@ -2422,7 +2712,7 @@
\raggeddictum\parbox{\dictumwidth}{%
{\@dictumfont{\raggeddictumtext #2\strut\par}%
\def\@tempa{#1}\ifx\@tempa\@empty\else%
- {\raggeddictumtext\vskip-1ex\hrulefill\par}%
+ {\raggeddictumtext\dictumrule}%
\raggeddictumauthor\@dictumauthorfont\dictumauthorformat{#1}%
\strut\par%
\fi%
@@ -2430,6 +2720,7 @@
}\par%
\endgroup
}
+\newcommand*{\dictumrule}{\vskip-1ex\hrulefill\par}%
\newcommand*{\dictumwidth}{.3333\textwidth}
\newcommand*{\raggeddictum}{\raggedleft}
\newcommand*{\dictumauthorformat}[1]{(#1)}
@@ -2488,7 +2779,7 @@
\DeclareRobustCommand*\textsubscript[1]{%
\@textsubscript{\selectfont#1}%
}
-\newcommand{\@textsubscript}[1]{%
+\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
%%% From File: scrkpage.dtx
@@ -2548,18 +2839,18 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\chaptermark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\ifnum \c@secnumdepth >\m@ne
+ {\MakeMarkcase{\ifnum \c@secnumdepth >\m@ne
\if@mainmatter
\chaptermarkformat
\fi
\fi
- ##1}{}%
+ ##1}}{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside
- \markright{\ifnum \c@secnumdepth >\z@
+ \markright{\MakeMarkcase{\ifnum \c@secnumdepth >\z@
\sectionmarkformat\fi
- ##1}%
+ ##1}}%
\fi
}%
}%
@@ -3086,6 +3377,12 @@
\newcommand*{\captionaboveof}{\@captionabovetrue\captionof}
\newcommand*{\captionbelowof}{\@captionabovefalse\captionof}
\BeforePackage{capt-of}{\let\captionof\relax}
+\newenvironment{captionofbeside}[1]{%
+ \def\@captype{#1}%
+ \captionbeside
+}{%
+ \endcaptionbeside
+}
\newcommand*\figurename{Figure}
\newcommand*\tablename{Table}
\newcounter{figure}[chapter]
@@ -3264,6 +3561,16 @@
\fi
\let\@footnotetext\scr@saved@footnotetext
}
+\BeforePackage{setspace}{%
+ \let\@footnotetext\scr@saved@footnotetext
+}
+\AfterPackage{setspace}{%
+ \let\scr@saved@footnotetext\@footnotetext
+ \renewcommand{\@footnotetext}[1]{%
+ \scr@saved@footnotetext{#1}%
+ \csname FN@mf@prepare\endcsname
+ }%
+}
\newcommand*{\multiplefootnoteseparator}{%
\begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup
}
@@ -3350,7 +3657,7 @@
KOMA-Script soon, so it should not be used
}%
\chapter*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
+ \@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}%
}
\newcommand*{\toc@l@number}{}
\newcommand*{\tableofcontents}{%
@@ -3366,7 +3673,7 @@
\newcommand*{\float@listhead}[1]{%
\scr@float@listhead@warning
\float@@listhead{#1}%
- \@mkboth{#1}{#1}%
+ \@mkboth{\MakeMarkcase{#1}}{\MakeMarkcase{#1}}%
\if@dynlist%
\newcommand*{\scr@starttoc}{}%
\let\scr@starttoc=\@starttoc
@@ -3497,7 +3804,7 @@
\newcommand*{\idx@heading}{%
\if@openright\cleardoublepage\else\clearpage\fi%
\twocolumn[\idx@@heading{\indexname}]%
- \@mkboth{\indexname}{\indexname}%
+ \@mkboth{\MakeMarkcase{\indexname}}\MakeMarkcase{{\indexname}}%
}
\newenvironment{theindex}{%
\if@twocolumn
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 255c8bb0acf..f34fe6fe220 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrdate,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -66,7 +66,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% 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 1e4d7c611d5..1dca5a839f9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
@@ -1,6 +1,6 @@
% ======================================================================
% scrdoc.dtx
-% Copyright (c) Markus Kohm, 2002-2011
+% Copyright (c) Markus Kohm, 2002-2012
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrdoc.dtx
-% Copyright (c) Markus Kohm, 2002-2011
+% Copyright (c) Markus Kohm, 2002-2012
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index f64d14dd229..1615b5dab2d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -30,7 +30,7 @@
%% scrklist.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -97,7 +97,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrextend.dtx
\ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
@@ -226,6 +226,7 @@
\@namedef{scr@v@3.08b}{10}
\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@3.09a}{10}
+\@namedef{scr@v@3.10}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -359,7 +360,7 @@
\fi
\ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
- \let\FN@mf@prepare\scr@mf@prepare
+ \def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
@@ -865,7 +866,7 @@
\raggeddictum\parbox{\dictumwidth}{%
{\@dictumfont{\raggeddictumtext #2\strut\par}%
\def\@tempa{#1}\ifx\@tempa\@empty\else%
- {\raggeddictumtext\vskip-1ex\hrulefill\par}%
+ {\raggeddictumtext\dictumrule}%
\raggeddictumauthor\@dictumauthorfont\dictumauthorformat{#1}%
\strut\par%
\fi%
@@ -873,6 +874,7 @@
}\par%
\endgroup
}
+\newcommand*{\dictumrule}{\vskip-1ex\hrulefill\par}%
\newcommand*{\dictumwidth}{.3333\textwidth}
\newcommand*{\raggeddictum}{\raggedleft}
\newcommand*{\dictumauthorformat}[1]{(#1)}
@@ -919,7 +921,7 @@
\DeclareRobustCommand*\textsubscript[1]{%
\@textsubscript{\selectfont#1}%
}
-\newcommand{\@textsubscript}[1]{%
+\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
%%% From File: scrkpage.dtx
@@ -1034,12 +1036,49 @@
\fi
\let\@footnotetext\scr@saved@footnotetext
}
+\BeforePackage{setspace}{%
+ \let\@footnotetext\scr@saved@footnotetext
+}
+\AfterPackage{setspace}{%
+ \let\scr@saved@footnotetext\@footnotetext
+ \renewcommand{\@footnotetext}[1]{%
+ \scr@saved@footnotetext{#1}%
+ \csname FN@mf@prepare\endcsname
+ }%
+}
\newcommand*{\multiplefootnoteseparator}{%
\begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup
}
\providecommand*{\multfootsep}{,}
\newcommand*{\multiplefootnotemarker}{3sp}
\providecommand*{\thefootnotemark}{\@thefnmark}
+\def\reserved@a{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
+\ifx\reserved@a\@makefnmark
+\deffootnotemark{\textsuperscript{\thefootnotemark}}
+\else
+ \IfFileExists{etoolbox.sty}{%
+ \PackageInfo{scrextend}{%
+ unexpected definition of `\string\@makefnmark'.\MessageBreak
+ Trying to patch it%
+ }%
+ \RequirePackage{etoolbox}%
+ \patchcmd{\@makefnmark}{\@thefnmark}{\thefootnotemark}{%
+ \PackageInfo{scrextend}{patch seems to be successfull}%
+ }{%
+ \PackageWarning{scrextend}{%
+ patching `\string\@makefnmark' failed.\MessageBreak
+ Using hard coded redefinition%
+ }%
+ \deffootnotemark{\textsuperscript{\thefootnotemark}}%
+ }%
+ }{%
+ \PackageWarning{scrextend}{%
+ unexpected definition of `\string\@makefnmark'.\MessageBreak
+ Using hard coded redefintion%
+ }%
+ \deffootnotemark{\textsuperscript{\thefootnotemark}}%
+ }%
+\fi
\providecommand*{\footref}[1]{%
\begingroup
\unrestored@protected@xdef\@thefnmark{\ref{#1}}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index 8412663320f..e67c717f72b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -10,7 +10,7 @@
%% scrkfont.dtx (with options: `package,generator,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrkfont.dtx
\ProvidesPackage{scrfontsizes}[%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 6a9a78d8f8e..526a13293d3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -11,7 +11,7 @@
%% scrhack.dtx (with options: `package,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -66,7 +66,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrhack.dtx
%%% using: package,identify
@@ -81,6 +81,8 @@
\@scrhack@hyperreftrue
\KOMA@ifkey{float}{@scrhack@float}%
\@scrhack@floattrue
+\KOMA@ifkey{floatrow}{@scrhack@floatrow}%
+\@scrhack@floatrowtrue
\KOMA@ifkey{listings}{@scrhack@listings}%
\@scrhack@listingstrue
\KOMAProcessOptions\relax
@@ -133,6 +135,12 @@
}%
\if@scrhack@float\scr@hack@load\@pkgextension{float}\fi
}
+\AfterPackage*{floatrow}{%
+ \KOMA@key[.scrhack.sty]{floatrow}{%
+ \PackageWarning{scrhack}{option `floatrow' ignored}%
+ }%
+ \if@scrhack@floatrow\scr@hack@load\@pkgextension{floatrow}\fi
+}
\AfterPackage*{listings}{%
\KOMA@key[.scrhack.sty]{listings}{%
\PackageWarning{scrhack}{option `listings' ignored}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index c1ad2569b1b..1492ea66856 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -7,7 +7,7 @@
%% scrjura.dtx (with options: `package')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2011
+%% Copyright (c) 2007-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -41,7 +41,7 @@
%%% From File: scrjura.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}
- [2010/06/07 v0.5d KOMA-Script for jurists
+ [2011/09/30 v0.6 KOMA-Script for jurists
(package)%
]
\@ifpackageloaded{hyperref}{%
@@ -57,8 +57,45 @@
\DeclareOption{contract}{%
\g@addto@macro\document\contract%
}
-\KOMA@ifkey{juratotoc}{@juratotoc}
+\newcounter{juratoclevel}\setcounter{juratoclevel}{\@M}
+\KOMA@key{juratotoc}[true]{%
+ \begingroup
+ \newif\if@setjuratoclevel\@setjuratocleveltrue
+ \let\juratoclevel@@FamilyUnknownKeyValue\FamilyUnknownKeyValue
+ \renewcommand*{\FamilyUnknownKeyValue}[4]{%
+ \setcounter{juratoclevel}{#1}%
+ \@setjuratoclevelfalse
+ }%
+ \KOMA@set@ifkey{juratoclevel}{@tempswa}{#1}%
+ \if@setjuratoclevel
+ \if@tempswa
+ \setcounter{juratoclevel}{2}%
+ \else
+ \setcounter{juratoclevel}{\@M}%
+ \fi
+ \fi
+ \endgroup
+}
+\newcommand*{\cpar@numberwidth}{2em}
+\newcommand*{\cpar@indent}{1.5em}
+\KOMA@key{juratocnumberwidth}{%
+ \begingroup\setlength{\@tempdima}{#1}\endgroup
+ \renewcommand*{\cpar@numberwidth}{#1}%
+}
+\KOMA@key{juratocindent}{%
+ \begingroup\setlength{\@tempdima}{#1}\endgroup
+ \renewcommand*{\cpar@indent}{#1}%
+}
\KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak}
+\newif\ifparnumber
+\KOMA@key{parnumber}[true]{%
+ \ifstr{#1}{auto}{\AutoPar}{%
+ \ifstr{#1}{manual}{\ManualPar}{%
+ \def\FamilyElseValue{, `auto', `semi'}%
+ \KOMA@set@ifkey{parnumber}{parnumber}{#1}%
+ }%
+ }%
+}
\newcommand*{\Paragraphmark}[1]{}
\KOMA@key{paragraphmark}{%
\begingroup
@@ -74,17 +111,26 @@
\let\Paragraphmark\@gobble
\or
\endgroup
- \renewcommand*{\Paragraphmark}[1]{\markright{##1}}%
+ \renewcommand*{\Paragraphmark}[1]{%
+ \markright{\csname MakeMarkcase\endcsname{##1}}}%
\or
\endgroup
- \renewcommand*{\Paragraphmark}[1]{\markboth{##1}{##1}}%
+ \renewcommand*{\Paragraphmark}[1]{%
+ \markboth{\csname MakeMarkcase\endcsname{##1}}%
+ {\csname MakeMarkcase\endcsname{##1}}}%
\or
\endgroup
\renewcommand*{\Paragraphmark}[1]{%
- \ifx\@mkboth\@gobbletwo\else\markright{##1}\fi}%
+ \ifx
+ \@mkboth\@gobbletwo
+ \else
+ \markright{\csname MakeMarkcase\endcsname{##1}}%
+ \fi}%
\or
\endgroup
- \renewcommand*{\Paragraphmark}[1]{\@mkboth{##1}{##1}}%
+ \renewcommand*{\Paragraphmark}[1]{%
+ \@mkboth{\csname MakeMarkcase\endcsname{##1}}%
+ {\csname MakeMarkcase\endcsname{##1}}}%
\else
\endgroup
\fi
@@ -107,7 +153,8 @@
{long}{11},%
{short}{22},%
{numeric}{33},%
- {paragraphonly}{44},{ParagraphOnly}{44},{OnlyParagraph}{44}%
+ {paragraphonly}{44},{onlyparagraph}{44},%
+ {ParagraphOnly}{44},{OnlyParagraph}{44}%
}{#1}%
\@tempcnta=\@tempa\relax
\@tempcntb=\z@
@@ -161,6 +208,7 @@
\let\Par\contract@everypar
\let\Sentence\contract@sentence
\renewcommand*{\jura@env@type}{contract}%
+ \aliaskomafont{Paragraph}{contract.Paragraph}%
\else
\PackageError{contract}{nested `contract' detected}{%
You may not use a `contract' environment inside\MessageBreak
@@ -185,8 +233,20 @@
\ifx\contract@entry\relax\def\contract@entry{\contract@title}\fi
\ifx\contract@head\relax\def\contract@head{\contract@title}\fi
}
-\define@key{contract}{entry}{\def\contract@entry{#1}}
-\define@key{contract}{noentry}[]{\let\contract@entry\relax}
+\define@key{contract}{entry}{%
+ \PackageWarning{scrjura}{deprecated option `entry'.\MessageBreak
+ You should use option `tocentry' instead of\MessageBreak
+ option `entry'%
+ }%
+ \def\contract@entry{#1}}
+\define@key{contract}{tocentry}{\def\contract@entry{#1}}
+\define@key{contract}{noentry}[]{%
+ \PackageWarning{scrjura}{deprecated option `noentry'.\MessageBreak
+ You should use option `notocentry' instead of\MessageBreak
+ option `noentry'%
+ }%
+ \let\contract@entry\relax}
+\define@key{contract}{notocentry}[]{\let\contract@entry\relax}
\define@key{contract}{head}{\def\contract@head{#1}}
\define@key{contract}{nohead}[]{\let\contract@head\relax}
\define@key{contract}{number}{\def\contract@number{#1}}
@@ -196,7 +256,9 @@
\define@key{contract}{postskip}{\def\contract@postskip{#1}}
\newif\ifcontract@dummy
\define@key{contract}{dummy}[true]{\csname contract@dummy#1\endcsname}
-\newcommand*{\contract@paragraph@font}{\sffamily\bfseries\large\@hangfrom}
+\newkomafont{contract.Paragraph}{\sffamily\bfseries\large}
+\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Paragraph}%
+ \@hangfrom}
\newcounter{@AbsParagraph}
\newcommand*{\theH@AbsParagraph}{P-\arabic{@AbsParagraph}}
\newcommand*{\theHParagraph}{\theH@AbsParagraph}
@@ -364,16 +426,17 @@
}%
}
\newcommand*{\l@cpar}[2]{%
- \if@juratotoc
- \@dottedtocline{\value{juratoclevel}}{1.5em}{2em}{#1}{#2}%
+ \ifnum\value{juratoclevel}>\value{tocdepth}\else
+ \scr@ifundefinedorrelax{bprot@dottedtocline}{%
+ \@dottedtocline
+ }{%
+ \bprot@dottedtocline
+ }{\value{juratoclevel}}{\cpar@indent}{\cpar@numberwidth}{#1}{#2}%
\fi
}
-\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}}
@@ -628,6 +691,14 @@
\providecaptionname{ngerman}\parshortname{Abs.}%
\providecaptionname{ngerman}\sentencename{Satz}%
\providecaptionname{ngerman}\sentenceshortname{S.}%
+ \providecaptionname{austrian}\parname{Absatz}%
+ \providecaptionname{austrian}\parshortname{Abs.}%
+ \providecaptionname{austrian}\sentencename{Satz}%
+ \providecaptionname{austrian}\sentenceshortname{S.}%
+ \providecaptionname{naustrian}\parname{Absatz}%
+ \providecaptionname{naustrian}\parshortname{Abs.}%
+ \providecaptionname{naustrian}\sentencename{Satz}%
+ \providecaptionname{naustrian}\sentenceshortname{S.}%
}
\providecommand*{\parname}{\scrjura@lang@error{\parname}}
\providecommand*{\parshortname}{\scrjura@lang@error{\parshortname}}
@@ -637,8 +708,8 @@
\PackageErrorNoLine{scrjura}{%
current language not supported%
}{%
- Currently scrjura only supports languages ``german'' and
- ``ngerman''.\MessageBreak
+ Currently scrjura only supports languages `german',
+ `ngerman', `austrian', and `naustrian'.\MessageBreak
It seems, that you are using another language (maybe
\languagename).\MessageBreak
Because of this you have to define \string#1\space by
@@ -656,7 +727,7 @@
\newcommand*{\getmaxpar}[3]{%
\begingroup
\expandafter\let\csname #2@Paragraphformat\endcsname\@firstofone
- \edef\@tempa{#3}%
+ \protected@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 ae5fd72eff0..10f553b48a5 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -12,7 +12,7 @@
%% scrkfont.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -67,7 +67,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
index 61344386420..1583e2b5dd7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
@@ -7,7 +7,7 @@
%% scrlettr.dtx (with options: `scrlettr')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 97fe236e763..436c8c8a2f6 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -39,7 +39,7 @@
%% scrkcile.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -177,6 +177,7 @@
\@namedef{scr@v@3.08b}{10}
\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@3.09a}{10}
+\@namedef{scr@v@3.10}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -548,7 +549,7 @@
\fi
\ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
- \let\FN@mf@prepare\scr@mf@prepare
+ \def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
@@ -1219,7 +1220,7 @@
\DeclareRobustCommand*\textsubscript[1]{%
\@textsubscript{\selectfont#1}%
}
-\newcommand{\@textsubscript}[1]{%
+\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
%%% From File: scrklco.dtx
@@ -1958,19 +1959,30 @@
%%% From File: scrkpar.dtx
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
-\newcommand*{\scr@selectfont}{}\let\scr@selectfont\selectfont
+\newcommand*{\scr@selectfont}{}
+\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
\BeforePackage{everysel}{%
- \ifx\selectfont\scr@new@selectfont\else
- \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
- \fi
- \let\selectfont\scr@selectfont
+ \AtBeginDocument{%
+ \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else
+ \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
+ \fi
+ \expandafter\let\csname selectfont \endcsname\scr@selectfont
+ }%
}
\AfterPackage{everysel}{%
- \g@addto@macro\selectfont{\par@update}%
- \let\scr@new@selectfont\selectfont
+ \g@addto@macro\@EverySelectfont@Init{%
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
+ }%
+}
+\AfterPackage{tracefnt}{%
+ \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
}
-\g@addto@macro\selectfont{\par@update}
-\newcommand*{\scr@new@selectfont}{}\let\scr@new@selectfont\selectfont
+\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}
+\newcommand*{\scr@new@selectfont}{}
+\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
\newcommand*{\par@updaterelative}{%
\begingroup
\edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent
@@ -2270,6 +2282,16 @@
\fi
\let\@footnotetext\scr@saved@footnotetext
}
+\BeforePackage{setspace}{%
+ \let\@footnotetext\scr@saved@footnotetext
+}
+\AfterPackage{setspace}{%
+ \let\scr@saved@footnotetext\@footnotetext
+ \renewcommand{\@footnotetext}[1]{%
+ \scr@saved@footnotetext{#1}%
+ \csname FN@mf@prepare\endcsname
+ }%
+}
\newcommand*{\multiplefootnoteseparator}{%
\begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
index 5b30e529e2e..73aeb46512c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
@@ -7,7 +7,7 @@
%% scrpage.dtx (with options: `scrpage,v1')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index bff9a989924..b3216cfe07e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -7,7 +7,7 @@
%% scrpage.dtx (with options: `scrpage,v2')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 9bcdedab971..4838268102e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -40,7 +40,7 @@
%% scrklist.dtx (with options: `class,report,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -187,6 +187,7 @@
\@namedef{scr@v@3.08b}{10}
\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@3.09a}{10}
+\@namedef{scr@v@3.10}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -548,18 +549,21 @@
\KOMA@set@ncmdkey{headings}{@tempa}{%
{big}{0},%
{normal}{1},%
- {small}{2}%
- ,{openany}{3},%
+ {small}{2},%
+ {openany}{3},%
{openright}{4},%
- {openleft}{5}%
- ,{twolinechapter}{6},{chapterprefix}{6},{chapterwithprefix}{6},%
+ {openleft}{5},%
+ {twolinechapter}{6},{chapterprefix}{6},{chapterwithprefix}{6},%
{chapterwithprefixline}{6},%
{onelinechapter}{7},{nochapterprefix}{7},{chapterwithoutprefix}{7},%
- {chapterwithoutprefixline}{7}%
- ,{twolineappendix}{8},{appendixprefix}{8},{appendixwithprefix}{8},%
+ {chapterwithoutprefixline}{7},%
+ {twolineappendix}{8},{appendixprefix}{8},{appendixwithprefix}{8},%
{appendixwithprefixline}{8},%
{onelineappendix}{9},{noappendixprefix}{9},{appendixwithoutprefix}{9},%
- {appendixwithoutprefixline}{9}%
+ {appendixwithoutprefixline}{9},%
+ {optiontotocandhead}{10},{optiontoheadandtoc}{10},%
+ {optiontotoc}{11},%
+ {optiontohead}{12}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*{\chapterheadstartvskip}{%
@@ -623,11 +627,21 @@
\KOMA@options{appendixprefix=true}{}%
\or
\KOMA@options{appendixprefix=false}{}%
+ \or
+ \scr@activate@xsection{3}%
+ \or
+ \scr@activate@xsection{2}%
+ \or
+ \scr@activate@xsection{1}%
\fi
}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
+\newcommand*{\scr@osectarg}{0}
+\newcommand*{\scr@activate@xsection}[1]{%
+ \renewcommand*{\scr@osectarg}{#1}%
+}
%%% From File: scrkpage.dtx
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
@@ -785,7 +799,7 @@
\fi
\ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
- \let\FN@mf@prepare\scr@mf@prepare
+ \def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
@@ -1017,7 +1031,7 @@
\scr@bibstyle@oldstyle
\newcommand*\bib@heading{%
\chapter*{\bibname}%
- \@mkboth{\bibname}{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
}
\KOMA@key{bibliography}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1031,17 +1045,18 @@
\ifcase \@tempa\relax
\renewcommand*\bib@heading{%
\chapter*{\bibname}%
- \@mkboth{\bibname}{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
}%
\or% totoc
\renewcommand*\bib@heading{%
\addchap{\bibname}%
- \@mkboth{\bibname}{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
}%
\or% numbered
\renewcommand*\bib@heading{%
\chapter{\bibname}%
- \@mkboth{\chaptermarkformat \bibname}{\chaptermarkformat \bibname}%
+ \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
+ {\MakeMarkcase{\chaptermarkformat \bibname}}%
}
\fi
}{%
@@ -1377,19 +1392,30 @@
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
\setlength{\columnseprule}{\z@}
-\newcommand*{\scr@selectfont}{}\let\scr@selectfont\selectfont
+\newcommand*{\scr@selectfont}{}
+\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
\BeforePackage{everysel}{%
- \ifx\selectfont\scr@new@selectfont\else
- \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
- \fi
- \let\selectfont\scr@selectfont
+ \AtBeginDocument{%
+ \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else
+ \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
+ \fi
+ \expandafter\let\csname selectfont \endcsname\scr@selectfont
+ }%
}
\AfterPackage{everysel}{%
- \g@addto@macro\selectfont{\par@update}%
- \let\scr@new@selectfont\selectfont
+ \g@addto@macro\@EverySelectfont@Init{%
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
+ }%
}
-\g@addto@macro\selectfont{\par@update}
-\newcommand*{\scr@new@selectfont}{}\let\scr@new@selectfont\selectfont
+\AfterPackage{tracefnt}{%
+ \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
+ \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
+}
+\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}
+\newcommand*{\scr@new@selectfont}{}
+\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
\newcommand*{\par@updaterelative}{%
\begingroup
\edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent
@@ -1754,11 +1780,129 @@
\fi
\@@maybeautodot
}
-\let\scr@sect\@sect
-\renewcommand*{\@sect}[1]{\stepcounter{#1}%
- \expandafter\@maybeautodot\csname the#1\endcsname
- \addtocounter{#1}{-1}\scr@sect{#1}%
-}
+\def\@tempa#1#2#3#4#5#6[#7]#8{%
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \begingroup
+ #6{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #8\@@par}%
+ \endgroup
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else
+ \protect\numberline{\csname the#1\endcsname}%
+ \fi
+ #7}%
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax
+ \@svsec #8}%
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else
+ \protect\numberline{\csname the#1\endcsname}%
+ \fi
+ #7}}%
+ \fi
+ \@xsect{#5}}
+\ifx\@sect\@tempa\else
+ \ClassWarning{\KOMAClassName}{%
+ Unexpected definition of \string\@sect!\MessageBreak
+ Please send an information about this to\MessageBreak
+ the KOMA-Script maintainer!\MessageBreak
+ Maybe LaTeX will be broken by the redefinition\MessageBreak
+ of \string\@sect\space}%
+\fi
+\def\@sect#1#2#3#4#5#6[#7]#8{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#7=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#8},head={#8},#7}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#8},head={#7}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#8}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}%
+ \fi
+ \fi
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \expandafter\@maybeautodot\csname the#1\endcsname
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \begingroup
+ #6{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #8\@@par}%
+ \endgroup
+ \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \expandafter\global\expandafter\def
+ \csname add#1tocentry\endcsname##1##2{%
+ \addtocentrydefault{#1}{##1}{##2}%
+ }%
+ }{}%
+ \ifnum #2>\c@secnumdepth
+ \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
+ \else
+ \csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
+ \scr@ds@tocentry}%
+ \fi
+ \fi
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax
+ \@svsec #8}%
+ \expandafter\csname #1mark\expandafter\endcsname\expandafter{%
+ \scr@ds@head}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \expandafter\global\expandafter\def
+ \csname add#1tocentry\endcsname####1####2{%
+ \addtocentrydefault{#1}{####1}{####2}%
+ }%
+ }{}%
+ \ifnum #2>\c@secnumdepth
+ \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
+ \else
+ \csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
+ \scr@ds@tocentry}%
+ \fi
+ \fi
+ }%
+ \fi
+ \@xsect{#5}%
+}
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.section]{KOMAarg}
+\DefineFamilyKey[.section]{KOMAarg}{tocentry}{\def\scr@ds@tocentry{#1}}
+\DefineFamilyKey[.section]{KOMAarg}{head}{\def\scr@ds@head{#1}}
+\newcommand*\scr@ds@tocentry{}
+\newcommand*\scr@ds@head{}
+\newcommand*{\scr@istest}{}
+\def\scr@istest#1=#2\@nil{%
+ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
+}
+\newif\if@scr@tempswa
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
\string\global\string\@altsecnumformattrue}%
@@ -1850,12 +1994,34 @@
}
\newcommand*{\@part}{}
\def\@part[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
\@maybeautodot\thepart%
- \addparttocentry{\thepart}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addparttocentry{\thepart}{\scr@ds@tocentry}%
+ \fi
\else
- \addparttocentry{}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addparttocentry{}{\scr@ds@tocentry}%
+ \fi
\fi
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -1866,8 +2032,12 @@
\size@partnumber{\partformat}%
\partheadmidvskip
\fi
- \size@part{#2}\strut%
- \partmark{#1}\par
+ \size@part{#2}\strut
+ \ifx\partmark\@gobble
+ \@mkboth{}{}\par
+ \else
+ \expandafter\partmark\expandafter{\scr@ds@head}\par
+ \fi
\endgroup
\@endpart
}
@@ -1906,10 +2076,35 @@
}
\newcommand*{\@addpart}{}
\def\@addpart[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
\csname phantomsection\endcsname
- \addparttocentry{}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{%
+ \scr@ds@tocentry}%
\@spart{#2}%
- \ifx\partmark\@gobble\else\@mkboth{#1}{}\fi
+ \ifx\partmark\@gobble
+ \@mkboth{}{}%
+ \else
+ \expandafter\@mkboth\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
+ \fi
}
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
@@ -1957,56 +2152,81 @@
\secdef\@chapter\@schapter
}
\newcommand*{\@chapter}{}
-\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+\def\@chapter[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
+ \ifnum \c@secnumdepth >\m@ne
\refstepcounter{chapter}%
\@maybeautodot\thechapter
\typeout{\@chapapp\space\thechapter.}%
- \addchaptertocentry{\thechapter}{#1}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addcontentsline{\@currext}{chapteratlist}{%
+ \protect\numberline{\thechapter}\scr@ds@tocentry}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{%
+ \scr@float@addtolists@warning
+ \scr@ifundefinedorrelax{@currentHref}{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{%
+ \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}%
+ }%
+ }{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{%
+ \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}{%
+ \@currentHref}%
+ }%
+ }%
+ }%
+ \fi
+ \fi
+ \else
+ \ifx\scr@ds@tocentry\@empty\else
+ \addchaptertocentry{}{\scr@ds@tocentry}%
\if@chaptertolists
\doforeachtocfile{%
\iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{%
- \protect\numberline{\thechapter}#1}%
+ \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
}{}%
}%
\@ifundefined{float@addtolists}{}{%
\scr@float@addtolists@warning
\scr@ifundefinedorrelax{@currentHref}{%
\float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}#1}{\thepage}%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
}%
}{%
\float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}#1}{\thepage}{\@currentHref}%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
+ \@currentHref}%
}%
}%
}%
\fi
- \else
- \addchaptertocentry{}{#1}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{#1}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}{\@currentHref}%
- }%
- }%
- }%
\fi
\fi
- \chaptermark{#1}%
+ \expandafter\chaptermark\expandafter{\scr@ds@head}%
\ifdim \@chapterlistsgap>\z@
\doforeachtocfile{%
\iftocfeature{\@currext}{chapteratlist}{%
@@ -2085,33 +2305,56 @@
\@@makeschapterhead{#1}%
\use@preamble{chapter@u}\nobreak
}
-\newcommand\addchap{\if@openright\cleardoublepage\else\clearpage\fi
+\newcommand\addchap{%
+ \if@openright\cleardoublepage\else\clearpage\fi
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
\secdef\@addchap\@saddchap%
}%
\newcommand*{\@addchap}{}%
-\def\@addchap[#1]#2{\@schapter{#2}%
- \addchaptertocentry{}{#1}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{#1}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}{\@currentHref}%
+\def\@addchap[#1]#2{%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
+ \@schapter{#2}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \addchaptertocentry{}{\scr@ds@tocentry}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{%
+ \scr@float@addtolists@warning
+ \scr@ifundefinedorrelax{@currentHref}{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
+ }%
+ }{%
+ \float@addtolists{%
+ \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
+ \@currentHref}%
+ }%
}%
}%
- }%
+ \fi
\fi
\ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax
\ifdim \@chapterlistsgap>\z@
@@ -2126,15 +2369,59 @@
}%
\fi
\fi
- \if@twoside\@mkboth{#1}{}\else\@mkboth{}{#1}\fi
+ \if@twoside
+ \expandafter\@mkboth\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
+ \else
+ \expandafter\@mkboth\expandafter{\expandafter}\expandafter{%
+ \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}%
+ \fi
}%
\newcommand*{\@saddchap}[1]{\@schapter{#1}\@mkboth{}{}}%
\newcommand*\addsec{\secdef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
-\def\@addsec[#1]#2{\section*{#2}\addcontentsline{toc}{section}{#1}
- \if@twoside\ifx\@mkboth\markboth\markright{#1}\fi\fi
+\def\@addsec[#1]#2{\section*{#2}%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \fi
+ \fi
+ \ifx\scr@ds@tocentry\@empty\else
+ \addsectiontocentry{}{\scr@ds@tocentry}%
+ \fi
+ \if@twoside
+ \ifx\@mkboth\markboth
+ \expandafter\markright\expandafter{%
+ \expandafter\MakeMarkcase{\scr@ds@head}}%
+ \fi
+ \fi
}
\newcommand*{\@saddsec}[1]{\section*{#1}\@mkboth{}{}}
+\newcommand*{\addsectiontocentry}[2]{%
+ \addtocentrydefault{section}{#1}{#2}%
+}
+\newcommand*{\addsubsectiontocentry}[2]{%
+ \addtocentrydefault{subsection}{#1}{#2}%
+}
+\newcommand*{\addparagraphtocentry}[2]{%
+ \addtocentrydefault{paragraph}{#1}{#2}%
+}
+\newcommand*{\addsubparagraphtocentry}[2]{%
+ \addtocentrydefault{subparagraph}{#1}{#2}%
+}
\newcommand\section{\@startsection{section}{1}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
@@ -2404,7 +2691,7 @@
\raggeddictum\parbox{\dictumwidth}{%
{\@dictumfont{\raggeddictumtext #2\strut\par}%
\def\@tempa{#1}\ifx\@tempa\@empty\else%
- {\raggeddictumtext\vskip-1ex\hrulefill\par}%
+ {\raggeddictumtext\dictumrule}%
\raggeddictumauthor\@dictumauthorfont\dictumauthorformat{#1}%
\strut\par%
\fi%
@@ -2412,6 +2699,7 @@
}\par%
\endgroup
}
+\newcommand*{\dictumrule}{\vskip-1ex\hrulefill\par}%
\newcommand*{\dictumwidth}{.3333\textwidth}
\newcommand*{\raggeddictum}{\raggedleft}
\newcommand*{\dictumauthorformat}[1]{(#1)}
@@ -2466,7 +2754,7 @@
\DeclareRobustCommand*\textsubscript[1]{%
\@textsubscript{\selectfont#1}%
}
-\newcommand{\@textsubscript}[1]{%
+\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
%%% From File: scrkpage.dtx
@@ -2526,16 +2814,16 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\chaptermark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\ifnum \c@secnumdepth >\m@ne
+ {\MakeMarkcase{\ifnum \c@secnumdepth >\m@ne
\chaptermarkformat
\fi
- ##1}{}%
+ ##1}}{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside
- \markright{\ifnum \c@secnumdepth >\z@
+ \markright{\MakeMarkcase{\ifnum \c@secnumdepth >\z@
\sectionmarkformat\fi
- ##1}%
+ ##1}}%
\fi
}%
}%
@@ -3062,6 +3350,12 @@
\newcommand*{\captionaboveof}{\@captionabovetrue\captionof}
\newcommand*{\captionbelowof}{\@captionabovefalse\captionof}
\BeforePackage{capt-of}{\let\captionof\relax}
+\newenvironment{captionofbeside}[1]{%
+ \def\@captype{#1}%
+ \captionbeside
+}{%
+ \endcaptionbeside
+}
\newcommand*\figurename{Figure}
\newcommand*\tablename{Table}
\newcounter{figure}[chapter]
@@ -3232,6 +3526,16 @@
\fi
\let\@footnotetext\scr@saved@footnotetext
}
+\BeforePackage{setspace}{%
+ \let\@footnotetext\scr@saved@footnotetext
+}
+\AfterPackage{setspace}{%
+ \let\scr@saved@footnotetext\@footnotetext
+ \renewcommand{\@footnotetext}[1]{%
+ \scr@saved@footnotetext{#1}%
+ \csname FN@mf@prepare\endcsname
+ }%
+}
\newcommand*{\multiplefootnoteseparator}{%
\begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup
}
@@ -3318,7 +3622,7 @@
KOMA-Script soon, so it should not be used
}%
\chapter*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
+ \@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}%
}
\newcommand*{\toc@l@number}{}
\newcommand*{\tableofcontents}{%
@@ -3334,7 +3638,7 @@
\newcommand*{\float@listhead}[1]{%
\scr@float@listhead@warning
\float@@listhead{#1}%
- \@mkboth{#1}{#1}%
+ \@mkboth{\MakeMarkcase{#1}}{\MakeMarkcase{#1}}%
\if@dynlist%
\newcommand*{\scr@starttoc}{}%
\let\scr@starttoc=\@starttoc
@@ -3465,7 +3769,7 @@
\newcommand*{\idx@heading}{%
\if@openright\cleardoublepage\else\clearpage\fi%
\twocolumn[\idx@@heading{\indexname}]%
- \@mkboth{\indexname}{\indexname}%
+ \@mkboth{\MakeMarkcase{\indexname}}\MakeMarkcase{{\indexname}}%
}
\newenvironment{theindex}{%
\if@twocolumn
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 8b62604e61f..acaff9419e9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -8,7 +8,7 @@
%% scrkfont.dtx (with options: `clo,10pt')
%% scrkpar.dtx (with options: `clo,10pt')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 af5bd1cdf16..545643314e3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -8,7 +8,7 @@
%% scrkfont.dtx (with options: `clo,11pt')
%% scrkpar.dtx (with options: `clo,11pt')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 e212b5b1d51..d958bd37376 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -8,7 +8,7 @@
%% scrkfont.dtx (with options: `clo,12pt')
%% scrkpar.dtx (with options: `clo,12pt')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 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 c1b30bded36..72f33c513f7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrtime,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -66,7 +66,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrtime.dtx
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
new file mode 100644
index 00000000000..d5fc9f4e55e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
@@ -0,0 +1,211 @@
+%%
+%% This is file `scrwfile.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrwfile.dtx (with options: `package,trace,scrwfile,identify,option,body')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 2010-2012 by Markus Kohm <komascript(at)gmx.info>
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the conditions of
+%% 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.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".
+%%
+%% The Current Maintainer and author of this work is Markus Kohm.
+%%
+%% This file may only be distributed together with the file
+%% `scrwfile.dtx' and `scrlogo.dtx'. You may however distribute the files
+%% `scrwfile.dtx' and `scrlogo.dtx' without this file.
+%%
+%% If this file is a beta version, you are not allowed to distribute it.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% The english manual is at `scrwfile.dtx', too.
+%%
+%% The KOMA-Script bundle (but 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.
+%%
+%% THIS IS AN ALPHA VERSION!
+%% USAGE OF THIS VERSION IS ON YOUR OWN RISK!
+%% EVERYTHING MAY HAPPEN!
+%% EVERYTHING MAY CHANGE IN FUTURE!
+%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
+%%
+%%% From File: scrwfile.dtx
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+\ProvidesPackage{scrwfile}
+ [2011/09/11 v0.1c-alpha LaTeX2e KOMA-Script package (write and clone files)]
+\PackageWarningNoLine{scrwfile}{%
+ THIS IS AN ALPHA VERSION!\MessageBreak
+ USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
+ EVERYTHING MAY HAPPEN!\MessageBreak
+ EVERYTHING MAY CHANGE IN FUTURE!\MessageBreak
+ THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!\MessageBreak
+ Maybe, it would be better not to load this package.%
+}
+\RequirePackage{scrbase}[2010/09/17]
+\RequirePackage{tocbasic}[2010/10/01]
+\RequirePackage{scrlfile}[2010/09/30]
+\newcommand*{\scrwfile@if@only}[1]{%
+ \begingroup
+ \scr@ifundefinedorrelax{scrwfile@only}{\@tempswatrue}{%
+ \@tempswafalse
+ \edef\reserved@b{#1}%
+ \@for\reserved@a:=\scrwfile@only\do
+ {\ifx\reserved@a\reserved@b\@tempswatrue\fi}%
+ }%
+ \if@tempswa
+ \scr@ifundefinedorrelax{scrwfile@never}{}{%
+ \edef\reserved@b{#1}%
+ \@for\reserved@a:=\scrwfile@only\do
+ {\ifx\reserved@a\reserved@b\@tempswafalse\fi}%
+ }%
+ \fi
+ \expandafter\endgroup
+ \if@tempswa
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
+\newcommand*{\scrwfile@starttoc}[1]{%
+ \scrwfile@if@only{#1}{\scrwfile@@starttoc}{\scrwfile@saved@starttoc}{#1}%
+}
+\newcommand*{\scrwfile@@starttoc}[1]{%
+ \typeout{Use my own \string\@starttoc\space for #1}%
+ \begingroup
+ \if@filesw
+ \xdef\scrwfile@writefilelist{\scrwfile@writefilelist,#1}%
+ \fi
+ \@fileswfalse
+ \scrwfile@saved@starttoc{#1}%
+ \endgroup
+}
+\newcommand*{\scrwfile@writefile}[1]{%
+ \scrwfile@if@only{#1}{\scrwfile@@writefile}{\scrwfile@saved@writefile}{#1}%
+}
+\newcommand{\scrwfile@@writefile}[2]{%
+ \typeout{Use my own \string\@writefile\space for #1}%
+ \ifnum\scrwfile@wrtout>0
+ \begingroup
+ \@temptokena{#2}%
+ \immediate\write\scrwfile@wrtout{%
+ \string\@writefile{#1}{\the\@temptokena}%
+ }%
+ \scrwfile@process@clones{#1}%
+ \endgroup
+ \fi
+}
+\chardef\scrwfile@wrtout\z@
+\newcommand*{\scrwfile@writefilelist}{}
+\newcommand*{\scrwfile@saved@writefile}{}
+\BeforeClosingMainAux{%
+ \ifx\scrwfile@writefilelist\@empty\else
+ \let\scrwfile@saved@writefile\@writefile
+ \let\scrwfile@wrtout\@partaux
+ \immediate\openout\scrwfile@wrtout \jobname.wrt
+ \let\@writefile\scrwfile@writefile
+ \fi
+}
+\AfterReadingMainAux{%
+ \ifx\scrwfile@writefilelist\@empty\else
+ \immediate\closeout\scrwfile@wrtout
+ \chardef\scrwfile@wrtout\z@
+ \begingroup
+ \let\@writefile\scrwfile@saved@writefile
+ \@for\@currext:=\scrwfile@writefilelist\do{%
+ \begingroup
+ \ifx\@currext\@empty\else
+ \scr@ifundefinedorrelax{tf@\@currext}{%
+ \typeout{Process extension: `\@currext'}
+ \immediate\openout\@partaux \jobname.\@currext
+ \expandafter\let\csname tf@\@currext\endcsname\@partaux
+ \@input@{\jobname.wrt}%
+ \immediate\closeout\@partaux
+ }{}%
+ \fi
+ \endgroup
+ }%
+ \endgroup
+ \fi
+}
+\newcommand*{\scrwfile@saved@starttoc}{}
+\let\scrwfile@saved@starttoc\@starttoc
+\let\@starttoc\scrwfile@starttoc
+\newcommand*{\scrwfile@process@clones}[1]{%
+ \scr@ifundefinedorrelax{scrwfile@clone@#1}{}{%
+ \begingroup
+ \let\@@protect\protect\let\protect\@empty\afterassignment\restore@protect
+ \edef\reserved@b{\csname scrwfile@clone@#1\endcsname}%
+ \edef\reserved@c{,#1}%
+ \@for \reserved@a:=\reserved@b\do {%
+ \@tempswatrue
+ \@for \reserved@d:=\reserved@c\do {%
+ \ifx\reserved@d\reserved@a\@tempswafalse\fi
+ }%
+ \if@tempswa
+ \typeout{clone entry from `#1' to `\reserved@a'}%
+ \immediate\write\scrwfile@wrtout{%
+ \string\@writefile{\reserved@a}{\the\@temptokena}%
+ }%
+ \edef\reserved@c{\reserved@c,\reserved@a}%
+ \fi
+ }%
+ \endgroup
+ }%
+}%
+\newcommand*{\TOCclone}[3][]{%
+ \scr@ifundefinedorrelax{scrwfile@clone@#2}{%
+ \expandafter\protected@edef\csname scrwfile@clone@#2\endcsname{%
+ #3,\protect\csname scrwfile@clone@#3\endcsname
+ }%
+ }{%
+ \edef\reserved@b{\csname scrwfile@clone@#2\endcsname}%
+ \expandafter\protected@edef\csname scrwfile@clone@#2\endcsname{%
+ \csname scrwfile@clone@#2\endcsname,%
+ #3,%
+ \protect\csname scrwfile@clone@#3\endcsname
+ }%
+ }%
+ \scr@ifundefinedorrelax{scrwfile@clone@#3}{%
+ \expandafter\let\csname scrwfile@clone@#3\endcsname\@empty
+ }{}%
+ \ifattoclist{#3}{%
+ \PackageWarning{scrwfile}{`#3' already under control of
+ tocbasic.\MessageBreak
+ Nevertheless features will be set
+ }%
+ }{%
+ \addtotoclist[TOCclone]{#3}%
+ }%
+ \setuptoc{#3}{nobabel}%
+ \ifstr{#1}{}{%
+ }{%
+ \@namedef{listof#3name}{#1}%
+ \@namedef{listof#3}{\listoftoc{#3}}%
+ \iftocfeature{#2}{leveldown}{\setuptoc{#3}{leveldown}}{}%
+ \iftocfeature{#2}{numbered}{\setuptoc{#3}{numbered}}{}%
+ \iftocfeature{#2}{onecolumn}{\setuptoc{#3}{leveldownonecolumn}}{}%
+ \iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}%
+ }%
+}
+%%% 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 `scrwfile.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index fa009f9d22d..e658ea8b018 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -7,7 +7,7 @@
%% tocbasic.dtx (with options: `package')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2011
+%% Copyright (c) 2007-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index f940ae640b8..0ae8915dfde 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -7,7 +7,7 @@
%% tocstyle.dtx (with options: `package,trace,tocstyle')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2011 by Markus Kohm <komascript(at)gmx.info>
+%% Copyright (c) 2007-2012 by Markus Kohm <komascript(at)gmx.info>
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 1e3c7af6104..96e36a71f3f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -13,7 +13,7 @@
%% scrkcomp.dtx (with options: `package,typearea,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -68,7 +68,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrktare.dtx
\ProvidesPackage{typearea}[%
@@ -628,6 +628,7 @@
\@namedef{scr@v@3.08b}{10}
\@namedef{scr@v@3.09}{10}
\@namedef{scr@v@3.09a}{10}
+\@namedef{scr@v@3.10}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrktare.dtx
\InputIfFileExists{typearea.cfg}{%
@@ -804,6 +805,55 @@
\scr@ifundefinedorrelax{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}%
\fi
}
+\newcommand*{\scr@grouplevel@test}[1]{%
+ \ifcase\currentgrouptype\else
+ \PackageWarning{typearea}{%
+ \string#1\space used at group level
+ \the\currentgrouplevel.\MessageBreak
+ Using \string#1\space inside any group, e.g.\MessageBreak
+ environments, math mode, boxes, etc. may result in\MessageBreak
+ many type setting problems.\MessageBreak
+ You should move the command \string#1\MessageBreak
+ outside all groups%
+ }%
+ \fi
+}
+\newcommand*{\storeareas}[1]{%
+ \edef\reserved@a{%
+ \noexpand\newcommand*{\unexpanded{#1}}{%
+ \noexpand\scr@grouplevel@test\unexpanded{#1}%
+ \noexpand\paperheight=\the\paperheight\space
+ \noexpand\paperwidth=\the\paperwidth\space
+ \noexpand\topmargin=\the\topmargin\space
+ \noexpand\headheight=\the\headheight\space
+ \noexpand\headsep=\the\headsep\space
+ \noexpand\textheight=\the\textheight\space
+ \noexpand\vsize=\the\vsize\space
+ \noexpand\footskip=\the\footskip\space
+ \noexpand\@colht=\the\@colht\space
+ \noexpand\@colroom=\the\@colroom\space
+ \noexpand\textwidth=\the\textwidth\space
+ \noexpand\columnwidth=\the\columnwidth\space
+ \noexpand\hsize=\the\hsize\space
+ \noexpand\oddsidemargin=\the\oddsidemargin\space
+ \noexpand\evensidemargin=\if@twoside
+ \the\evensidemargin
+ \else
+ \the\oddsidemargin
+ \fi\space
+ \noexpand\linewidth=\the\linewidth\space
+ \noexpand\maxdepth=\the\maxdepth\space
+ \scr@ifundefinedorrelax{@pagesizelast}{}{%
+ \noexpand\KOMAoptions{pagesize=\@pagesizelast}}%
+ \noexpand\ta@div=\the\ta@div\space
+ \noexpand\ta@bcor=\the\ta@bcor\space
+ \noexpand\def\noexpand\@lastdiv{\@lastdiv}%
+ \noexpand\marginparsep=\the\marginparsep\space
+ \noexpand\marginparwidth=\the\marginparwidth\space
+ }%
+ }%
+ \reserved@a
+}
\newcommand*{\ta@divfor}[1]{%
\if@mincl
\PackageInfo{typearea}{%
@@ -849,20 +899,7 @@
\fi
}
\newcommand*\typearea[2][\z@]{%
- \scr@ifundefinedorrelax{currentgrouptype}{}{%
- \ifcase\currentgrouptype\else
- \PackageWarning{typearea}{%
- \string\typearea\space used at group level
- \the\currentgrouplevel.\MessageBreak
- Using \string\typearea\space inside any group, e.g.\MessageBreak
- environments, math mode, boxes, etc. may result in\MessageBreak
- many type setting problems. Because of this you\MessageBreak
- should never do this. You should move the
- \string\typearea\MessageBreak
- outside all groups%
- }%
- \fi
- }%
+ \scr@grouplevel@test\typearea
\edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else
\setlength{\ta@bcor}{#1}%
\fi
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index b5a42396083..f77dbe083a9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -6,11 +6,10 @@
%%
%% scrkvers.dtx (with options: `trace')
%% scrklco.dtx (with options: `lco,visualize,head')
-%% scrbeta.dtx (with options: `betarelease,visualize,lco')
%% scrklco.dtx (with options: `lco,visualize,body')
%% scrknpap.dtx (with options: `lco,visualize,body')
%%
-%% Copyright (c) 1994-2011
+%% Copyright (c) 1994-2012
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -65,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
@@ -81,20 +80,6 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrbeta.dtx
-%% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-%% THIS IS A BETA VERSION!
-%% YOU SHOULD NOT USE THIS VERSION!
-%% YOU SHOULD ONLY TEST THIS VERSION AND SEND FEEDBACK TO THE AUTHOR!
-%% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-\LCOWarningNoLine{%
- visualize%
-}{%
- THIS IS A BETA VERSION!\MessageBreak
- YOU SHOULD NOT USE THIS VERSION!\MessageBreak
- YOU SHOULD ONLY TEST THIS VERSION AND\MessageBreak
- SEND FEEDBACK TO THE AUTHOR!
-}
%%% From File: scrklco.dtx
\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}}
\newcommand*{\showfields}[1]{%