summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-17 01:13:08 +0000
committerKarl Berry <karl@freefriends.org>2010-02-17 01:13:08 +0000
commitfc452419467f73cbbe9e7748ac266442487b75c4 (patch)
tree9f2cc4858705479715feb886723ffd6361cbfc29 /Master/texmf-dist/tex
parent5323eaeeb7b140b77a69f88dba6a5ef38f12f60e (diff)
koma-script update (16feb10)
git-svn-id: svn://tug.org/texlive/trunk@17067 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-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.hak2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty30
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdoc.cls4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty60
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlettr.cls2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls52
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls10
-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.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty36
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty66
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco42
39 files changed, 276 insertions, 154 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 3018033252b..77acc43059a 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 5f84b401ded..e90d589d484 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 61be661340c..fdf097eff99 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 a9bd352e7c8..f5ccc9f9e4a 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 19ad9606489..c0a98338283 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 bbe34e4888d..ed1786ec31e 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 5ade2aad225..0b5a0b3322d 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 90a4714b656..b36bc04d831 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 ea31e0e6463..9f21c773769 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 e52ee3d6c5f..f38783da84c 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 7ed32cc66c5..ccc32795df4 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 95d3532cc9a..d1b11594fc5 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 cbf736eba7e..a47d1e9f321 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 1e72dff0647..a136d92e236 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 190f14f4aa2..d17132552d0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -7,7 +7,7 @@
%% scrhack.dtx (with options: `hack,float,identify')
%% scrhack.dtx (with options: `hack,float,body')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% 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/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index ce83f8132b2..143b7544836 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -7,7 +7,7 @@
%% scrhack.dtx (with options: `hack,hyperref,identify')
%% scrhack.dtx (with options: `hack,hyperref,body')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% 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/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index db774c2627e..dbd0ea4859e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -7,7 +7,7 @@
%% scrhack.dtx (with options: `hack,listings,identify')
%% scrhack.dtx (with options: `hack,listings,body')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% 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/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index b05fe4bb581..061ed15a964 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-2009
+%% Copyright (c) 1994-2010
%% 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 c6a2202d5e1..c6ed59bce1b 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/06/08 v3.03b}
+\def\tocbasicversion{2010/01/05 v3.04b}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\addtotoclist{toc}
@@ -1849,7 +1849,7 @@
\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth >\m@ne\relax
+ \ifnum \c@tocdepth >-2\relax
\addpenalty{\@secpenalty}%
\addvspace{2.25em \@plus\p@}%
\setlength{\@tempdima}{2em}%
@@ -2027,8 +2027,8 @@
Maybe you should load package `scrpage2', before\MessageBreak
using this element%
}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
- \thepage}}
+\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+ \thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
\let\@evenhead\@oddhead
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index c9493cfb994..ff90d0d74ab 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -321,7 +321,7 @@
\fi
}
\newcommand\ifstr[2]{%
- \begingroup\edef\@tempa{#1}\edef\@tempb{#2}%
+ \begingroup\protected@edef\@tempa{#1}\protected@edef\@tempb{#2}%
\ifx\@tempa\@tempb
\endgroup\expandafter\@firstoftwo
\else
@@ -500,13 +500,17 @@
\@for\scr@key@atlist:=#3\do{%
\expandafter\scr@key@split@name@value\scr@key@atlist==\@nil
\scr@ifundefinedorrelax{KV@#2@\scr@key@name}{}{%
- \edef\reserved@a{\noexpand\setkeys{#2}{\scr@key@atlist}%
+ \protected@edef\reserved@a{\noexpand\setkeys{#2}{\scr@key@atlist}%
+ \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}%
+ \noexpand\def\noexpand\scr@key@name{\scr@key@name}%
}%
\reserved@a
}%
\scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{}{%
- \edef\reserved@a{%
+ \protected@edef\reserved@a{%
\noexpand\setkeys{#2#1}{\scr@key@atlist}%
+ \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}%
+ \noexpand\def\noexpand\scr@key@name{\scr@key@name}%
}%
\reserved@a
}%
@@ -541,11 +545,11 @@
\@for\@tempa:=\@tempa\do{%
\scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{%
\scr@key@found@true
- \edef\reserved@a{\noexpand\setkeys{\@tempa}{\scr@key@atlist}%
- \noexpand\edef\noexpand\@tempa{\@tempa}%
- \noexpand\edef\noexpand\scr@key@atlist{\scr@key@atlist}%
- \noexpand\edef\noexpand\scr@key@name{\scr@key@name}%
- \noexpand\edef\noexpand\scr@key@value{\scr@key@value}%
+ \protected@edef\reserved@a{\noexpand\setkeys{\@tempa}{\scr@key@atlist}%
+ \noexpand\def\noexpand\@tempa{\@tempa}%
+ \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}%
+ \noexpand\def\noexpand\scr@key@name{\scr@key@name}%
+ \noexpand\def\noexpand\scr@key@value{\scr@key@value}%
}%
\reserved@a
}%
@@ -591,12 +595,12 @@
\let\reserved@a\@empty
\@for\@tempa:=#3\do{%
\expandafter\KV@@sp@def\expandafter\@tempa\expandafter{\@tempa}%
- \edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}%
+ \protected@edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}%
}%
\ifx\reserved@a\@empty
- \edef\reserved@a{\noexpand\setkeys{\@tempb}{\scr@key@name}}%
+ \protected@edef\reserved@a{\noexpand\setkeys{\@tempb}{\scr@key@name}}%
\else
- \edef\reserved@a{%
+ \protected@edef\reserved@a{%
\noexpand\setkeys{\@tempb}{\expandafter\@gobble\reserved@a}}%
\fi
\reserved@a
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index a55f7a618c5..76c85f77a6c 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/06/08 v3.03b}
+\def\tocbasicversion{2010/01/05 v3.04b}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -2534,8 +2534,8 @@
Maybe you should load package `scrpage2', before\MessageBreak
using this element%
}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
- \thepage}}
+\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+ \thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
\let\@evenhead\@oddhead
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index b7928126424..d7d4b14bb16 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -7,7 +7,7 @@
%% scrtime.dtx (with options: `scrdate')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% 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/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
index c8ac3f55d3e..27e6244c8be 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) 2002-2009 Markus Kohm
+% Copyright (c) Markus Kohm, 2002-2010
%
% 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) 2002-2009 Markus Kohm
+% Copyright (c) Markus Kohm, 2002-2010
%
% 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 8bc43bd0d98..f16f5741f0e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -29,7 +29,7 @@
%% scrklist.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -117,7 +117,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index d10ec1b27fb..126b5d382c4 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
%%% From File: scrhack.dtx
%%% using: package,identify
@@ -79,28 +79,10 @@
%%% using: package,option
\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
\@scrhack@hyperreftrue
-\AtBeginDocument{%
- \KOMA@key[.scrhack.sty]{hyperref}{%
- \PackageWarning{scrhack}{option `hyperref=#1' ignored}%
- }%
- \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi
-}
\KOMA@ifkey{float}{@scrhack@float}%
\@scrhack@floattrue
-\AfterPackage*{float}{%
- \KOMA@key[.scrhack.sty]{float}{%
- \PackageWarning{scrhack}{option `float' ignored}%
- }%
- \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi
-}
\KOMA@ifkey{listings}{@scrhack@listings}%
\@scrhack@listingstrue
-\AfterPackage*{listings}{%
- \KOMA@key[.scrhack.sty]{listings}{%
- \PackageWarning{scrhack}{option `listings' ignored}%
- }%
- \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi
-}
\KOMAProcessOptions\relax
%%% From File: scrhack.dtx
%%% using: package,body
@@ -121,9 +103,41 @@
\else
\expandafter\@firstoftwo
\fi
- {\PackageInfo{scrhack}{loading #2 hack}%
- \makeatletter\input{#2.hak}\makeatother}%
- {\PackageInfo{scrhack}{ignorring #2 hack}}%
+ {%
+ \PackageInfo{scrhack}{loading #2 hack}%
+ \edef\reserved@a{%
+ \noexpand\makeatletter\noexpand\input{#2.hak}%
+ \noexpand\catcode`\noexpand\@\the\catcode`\@\relax
+ }\reserved@a
+ }{%
+ \PackageInfo{scrhack}{ignorring #2 hack}%
+ }%
+}
+\AfterPackage*{hyperref}{%
+ \@ifpackagelater{hyperref}{2009/11/24}{%
+ \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
+ detection of hyperref version, that doesn't\MessageBreak
+ need that hack,}%
+ }{%
+ \AtEndOfPackage{%
+ \KOMA@key[.scrhack.sty]{hyperref}{%
+ \PackageWarning{scrhack}{option `hyperref=#1' ignored}%
+ }%
+ \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi
+ }%
+ }%
+}
+\AfterPackage*{float}{%
+ \KOMA@key[.scrhack.sty]{float}{%
+ \PackageWarning{scrhack}{option `float' ignored}%
+ }%
+ \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi
+}
+\AfterPackage*{listings}{%
+ \KOMA@key[.scrhack.sty]{listings}{%
+ \PackageWarning{scrhack}{option `listings' ignored}%
+ }%
+ \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi
}
%%% From File: scrlogo.dtx
\@ifundefined{KOMAScript}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 2faffb9538c..321001e1aea 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -10,7 +10,7 @@
%% scrkbase.dtx (with options: `package,body,koma')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -189,7 +189,7 @@
#1{%
You've used standard option `#2'.\MessageBreak
This is correct!\MessageBreak
- Internaly I'm using `#3'.\MessageBreak
+ Internally I'm using `#3'.\MessageBreak
If you'd like to set the option with \string\KOMAoptions,\MessageBreak
you'd have to use `#3' there\MessageBreak
instead of `#2', too%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
index 3784416ab91..801432e46e2 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-2009
+%% Copyright (c) 1994-2010
%% 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 0bebc90f6dc..06a044d4221 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -2098,9 +2098,9 @@
Font of page foot will also be changed%
}
\newcommand*{\scr@fnt@pagefoot}{\footfont}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
+\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
\pagename\ %
- \thepage}}
+ \thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{%
\vbox{\vbox{\hsize=\textwidth\hbox to\textwidth{%
@@ -2588,8 +2588,12 @@
\@newplength{sigindent}
\@newplength{firstfootvpos}
\@newplength{firstfootwidth}
+\@newplength{firstfoothpos}
+\@setplength{firstfoothpos}{\maxdimen}
\@newplength{firstheadvpos}
\@newplength{firstheadwidth}
+\@newplength{firstheadhpos}
+\@setplength{firstheadhpos}{\maxdimen}
\@newplength{fromrulewidth}
\@setplength{fromrulewidth}{0pt}
\@newplength{fromrulethickness}
@@ -2748,8 +2752,23 @@
\move@topt\vskip\useplength{firstheadvpos}%
\vb@t@z{%
\rlap{\move@topl
- \setlength\@tempskipa{.5\paperwidth}%
- \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}%
+ \ifdim\useplength{firstheadhpos}<\paperwidth
+ \ifdim \useplength{firstheadhpos}>-\paperwidth
+ \ifdim \useplength{firstheadhpos}<\z@
+ \setlength\@tempskipa{\paperwidth}%
+ \addtolengthplength{\@tempskipa}{firstheadhpos}%
+ \addtolengthplength[-]{\@tempskipa}{firstheadwidth}%
+ \else
+ \setlength{\@tempskipa}{\useplength{firstheadhpos}}%
+ \fi
+ \else
+ \setlength\@tempskipa{\oddsidemargin}%
+ \addtolength\@tempskipa{1in}%
+ \fi
+ \else
+ \setlength\@tempskipa{.5\paperwidth}%
+ \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}%
+ \fi
\hskip\@tempskipa
\vbox{\hsize\useplength{firstheadwidth}%
\setlength{\@tempskipa}{\useplength{toaddrvpos}}%
@@ -2771,9 +2790,24 @@
\typeout{Foot of first page}%
\vb@t@z{%
\rlap{\move@topl
- \setlength\@tempskipa{.5\paperwidth}%
- \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}%
- \hskip\@tempskipa%
+ \ifdim\useplength{firstfoothpos}<\paperwidth
+ \ifdim \useplength{firstfoothpos}>-\paperwidth
+ \ifdim \useplength{firstfoothpos}<\z@
+ \setlength\@tempskipa{\paperwidth}%
+ \addtolengthplength{\@tempskipa}{firstfoothpos}%
+ \addtolengthplength[-]{\@tempskipa}{firstfootwidth}%
+ \else
+ \setlength{\@tempskipa}{\useplength{firstfoothpos}}%
+ \fi
+ \else
+ \setlength\@tempskipa{\oddsidemargin}%
+ \addtolength\@tempskipa{1in}%
+ \fi
+ \else
+ \setlength\@tempskipa{.5\paperwidth}%
+ \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}%
+ \fi
+ \hskip\@tempskipa
\vbox{\hsize\useplength{firstfootwidth}%
\vskip\useplength{firstfootvpos}%
\setlength{\textwidth}{\useplength{firstfootwidth}}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
index 5af0a98001a..e9c08b4eb38 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-2009
+%% Copyright (c) 1994-2010
%% 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 7a629dec9ae..793b8999d96 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-2009
+%% Copyright (c) 1994-2010
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -43,7 +43,7 @@
%%% From File: scrpage.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}
- [2008/12/08 v2.3 LaTeX2e KOMA-Script
+ [2009/11/11 v2.4 LaTeX2e KOMA-Script
package]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
@@ -551,11 +551,7 @@
\let\@mkboth\@gobbletwo
\@automarkfalse
}
-\if@chapter
- \newcommand*{\partlevel}{-1}
-\else
- \newcommand*{\partlevel}{0}
-\fi
+\newcommand*{\partlevel}{-1}
\newcommand*{\chapterlevel}{0}
\newcommand*{\sectionlevel}{1}
\newcommand*{\subsectionlevel}{2}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 340f6b76eaa..f3caa549ba5 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/06/08 v3.03b}
+\def\tocbasicversion{2010/01/05 v3.04b}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -2512,8 +2512,8 @@
Maybe you should load package `scrpage2', before\MessageBreak
using this element%
}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
- \thepage}}
+\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+ \thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
\let\@evenhead\@oddhead
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 46e6d703580..e33d1df35c5 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 3adda41cdf9..417b9798858 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 c59634f57d6..548d6211541 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 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 bcd57e06f59..33fa468a96f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -7,7 +7,7 @@
%% scrtime.dtx (with options: `scrtime')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% 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/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index b94b548d2af..0a68e5881b1 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-2009
+%% Copyright (c) 2007-2010
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -39,7 +39,7 @@
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/06/08 v3.03b}
+\def\tocbasicversion{2010/01/05 v3.04b}
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocbasic}
[\tocbasicversion\space KOMA-Script package
@@ -235,10 +235,28 @@
\newcommand*{\tocbasic@@before@hook}{}
\newcommand*{\tocbasic@@after@hook}{}
\newcommand{\BeforeStartingTOC}[2][]{%
- \expandafter\g@addto@macro\csname tb@#1@before@hook\endcsname{#2}%
+ \ifx\relax#1\relax
+ \g@addto@macro\tocbasic@@before@hook{#2}%
+ \else
+ \scr@ifundefinedorrelax{tb@#1@before@hook}{%
+ \PackageInfo{tocbasic}{defining new hook before starting `#1'}%
+ \expandafter\global\expandafter\let\csname tb@#1@before@hook\endcsname
+ \@empty
+ }{}%
+ \expandafter\g@addto@macro\csname tb@#1@before@hook\endcsname{#2}%
+ \fi
}
\newcommand{\AfterStartingTOC}[2][]{%
- \expandafter\g@addto@macro\csname tb@#1@after@hook\endcsname{#2}%
+ \ifx\relax#1\relax
+ \g@addto@macro\tocbasic@@after@hook{#2}%
+ \else
+ \scr@ifundefinedorrelax{tb@#1@after@hook}{%
+ \PackageInfo{tocbasic}{defining new hook after starting `#1'}%
+ \expandafter\global\expandafter\let\csname tb@#1@after@hook\endcsname
+ \@empty
+ }{}%
+ \expandafter\g@addto@macro\csname tb@#1@after@hook\endcsname{#2}%
+ \fi
}
\newcommand*{\listoftoc}{%
\@ifstar \tocbasic@starttoc\@listoftoc
@@ -342,9 +360,19 @@
\csname tb@@afterhead@hook\endcsname
}
\newcommand{\BeforeTOCHead}[2][]{%
+ \scr@ifundefinedorrelax{tb@#1@beforehead@hook}{%
+ \PackageInfo{tocbasic}{defining new hook before heading of `#1'}%
+ \expandafter\global\expandafter\let\csname tb@#1@beforehead@hook\endcsname
+ \@empty
+ }{}%
\expandafter\g@addto@macro\csname tb@#1@beforehead@hook\endcsname{#2}%
}
\newcommand{\AfterTOCHead}[2][]{%
+ \scr@ifundefinedorrelax{tb@#1@afterhead@hook}{%
+ \PackageInfo{tocbasic}{defining new hook after heading of `#1'}%
+ \expandafter\global\expandafter\let\csname tb@#1@afterhead@hook\endcsname
+ \@empty
+ }{}%
\expandafter\g@addto@macro\csname tb@#1@afterhead@hook\endcsname{#2}%
}
\AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 409a2f42b93..816c9a97981 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-2009 by Markus Kohm <komascript(at)gmx.info>
+%% Copyright (c) 2007-2010 by Markus Kohm <komascript(at)gmx.info>
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -50,7 +50,7 @@
%%% From File: tocstyle.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
- [2008/10/20 v0.2c-alpha LaTeX2e KOMA-Script package (versatile toc styles)]
+ [2009/11/09 v0.2d-alpha LaTeX2e KOMA-Script package (versatile toc styles)]
\PackageWarningNoLine{tocstyle}{%
THIS IS AN ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
@@ -110,6 +110,12 @@
\fi
\endgroup
}
+\newif\iftochaschapter\tochaschapterfalse
+\ifcsname l@chapter\endcsname
+ \ifcsname chapter\endcsname
+ \tochaschaptertrue
+ \fi
+\fi
\DeclareOption{tocbreaksstrict}{\selecttocstyleoption\CurrentOption}
\DeclareOption{tocbreakscareless}{\selecttocstyleoption\CurrentOption}
\DeclareOption{tocindentauto}{\selecttocstyleoption\CurrentOption}
@@ -169,19 +175,20 @@
\tocstyle@feature@raggedhook
\@tempdima #3\relax
\@tempdimb #2\relax
- \typeout{m (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
+ \typeout{number indent by \string\l@... (\tocstyleTOC, \tocstyledepth): \space\the\@tempdimb}%
+ \typeout{text indent by \string\l@... (\tocstyleTOC, \tocstyledepth): \space\the\@tempdima}%
\ifnum #1>\z@\relax
\@tempcnta #1\relax \advance\@tempcnta \m@ne
- \ifcsname tocstyle@skipwidth@\tocstyleTOC @\the\@tempcnta\endcsname
- \ifcsname tocstyle@numwidth@\tocstyleTOC @\the\@tempcnta\endcsname
+ \ifcsname tocstyle@maxskipwidth@\tocstyleTOC @\the\@tempcnta\endcsname
+ \ifcsname tocstyle@maxnumwidth@\tocstyleTOC @\the\@tempcnta\endcsname
\@tempdimb
- \csname tocstyle@skipwidth@\tocstyleTOC @\the\@tempcnta\endcsname
+ \csname tocstyle@maxskipwidth@\tocstyleTOC @\the\@tempcnta\endcsname
\advance\@tempdimb
- \csname tocstyle@numwidth@\tocstyleTOC @\the\@tempcnta\endcsname
+ \csname tocstyle@maxnumwidth@\tocstyleTOC @\the\@tempcnta\endcsname
\fi
\fi
\fi
- \typeout{C (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
+ \typeout{number indent by parent (\tocstyleTOC, \tocstyledepth): \space\the\@tempdimb}%
\ifcsname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname
\ifdim \@tempdimb>
\csname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname\relax
@@ -201,11 +208,11 @@
\@tempdima \csname tocstyle@maxnumwidth@\tocstyleTOC @#1\endcsname
\relax
\fi
- \typeout{a (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
- \typeout{A (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
+ \typeout{text indent calculated (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
+ \typeout{number indent calculated (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
\else
\@tempdimb #2\relax
- \typeout{M (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
+ \typeout{number indent explicite (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
\fi
\ifcsname tocstyle@unumwidth@\tocstyleTOC @\endcsname
\ifdim \@tempdima>
@@ -223,8 +230,8 @@
\@tempdima \csname tocstyle@maxunumwidth@\tocstyleTOC @\endcsname
\relax
\fi
- \typeout{s (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
- \typeout{S (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
+ \typeout{text noindent (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
+ \typeout{number noindent (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
\fi
\advance\parindent \@tempdimb\@afterindenttrue
\advance\leftskip \parindent
@@ -306,13 +313,8 @@
}
\AtBeginDocument{%
\ifcsname l@part\endcsname
- \ifcsname l@chapter\endcsname
- \setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@part{\tocstyle@l@define{part}{-1}}{}}%
- \else
- \setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@part{\tocstyle@l@define{part}{0}}{}}%
- \fi
+ \setbox\@tempboxa\vbox{\hsize\maxdimen
+ \l@part{\tocstyle@l@define{part}{-1}}{}}%
\fi
\ifcsname l@chapter\endcsname
\setbox\@tempboxa\vbox{\hsize\maxdimen
@@ -509,7 +511,20 @@
\endgroup
}
\newcommand*{\tocstyle@set@width}[4]{%
- \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{#4}%
+ \iftocstyle@indentnotnumbered
+ \ifdim #4<\z@
+ \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{%
+ \dimexpr #4/2\relax}%
+ \else
+ \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{#4}%
+ \fi
+ \else
+ \ifdim #4<\z@
+ \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{\z@}%
+ \else
+ \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{#4}%
+ \fi
+ \fi
}
\newcommand*{\tocstyleTOC}{}
\newcommand*{\tocstyleAliasTOC}{}
@@ -738,8 +753,7 @@
\ifx\tocstyleAliasTOC\@tempa\aftergroup\bfseries\fi
\endgroup
}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname l@chapter\endcsname\relax
+ \iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
\settocfeature[1]{entryhook}{%
@@ -765,8 +779,7 @@
\ifx\tocstyleAliasTOC\@tempa\aftergroup\sffamily\bfseries\fi
\endgroup
}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname l@chapter\endcsname\relax
+ \iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
\settocfeature[1]{entryhook}{%
@@ -791,8 +804,7 @@
\ifx\tocstyleAliasTOC\@tempa\aftergroup\sectfont\fi
\endgroup
}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname l@chapter\endcsname\relax
+ \iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
\settocfeature[1]{entryhook}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index b9c74cee48e..1c4082d98cb 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-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
%%% From File: scrktare.dtx
\ProvidesPackage{typearea}[%
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index 9b05ae56aa2..4faca0dfbbe 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -10,7 +10,7 @@
%% scrklco.dtx (with options: `lco,visualize,body')
%% scrknpap.dtx (with options: `lco,visualize,body')
%%
-%% Copyright (c) 1994-2009
+%% Copyright (c) 1994-2010
%% 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{2009/07/24 v3.04a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
\endgroup
%%% From File: scrklco.dtx
\ProvidesFile{%
@@ -181,13 +181,47 @@
\showfield{1cm}{1cm}{10cm}{15cm}%
}
\newcommand*{\showfield@head}{%
- \showfield{\dimexpr (\paperwidth-\useplength{firstheadwidth})/2\relax}%
+ \ifdim\useplength{firstheadhpos}<\paperwidth
+ \ifdim \useplength{firstheadhpos}>-\paperwidth
+ \ifdim \useplength{firstheadhpos}<\z@
+ \setlength\@tempskipa{\paperwidth}%
+ \addtolengthplength{\@tempskipa}{firstheadhpos}%
+ \addtolengthplength[-]{\@tempskipa}{firstheadwidth}%
+ \else
+ \setlength{\@tempskipa}{\useplength{firstheadhpos}}%
+ \fi
+ \else
+ \setlength\@tempskipa{\oddsidemargin}%
+ \addtolength\@tempskipa{1in}%
+ \fi
+ \else
+ \setlength\@tempskipa{.5\paperwidth}%
+ \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}%
+ \fi
+ \showfield{\@tempskipa}%
{\useplength{firstheadvpos}}%
{\useplength{firstheadwidth}}%
{-\headheight}%
}
\newcommand*{\showfield@foot}{%
- \showfield{\dimexpr (\paperwidth-\useplength{firstfootwidth})/2\relax}%
+ \ifdim\useplength{firstfoothpos}<\paperwidth
+ \ifdim \useplength{firstfoothpos}>-\paperwidth
+ \ifdim \useplength{firstfoothpos}<\z@
+ \setlength\@tempskipa{\paperwidth}%
+ \addtolengthplength{\@tempskipa}{firstfoothpos}%
+ \addtolengthplength[-]{\@tempskipa}{firstfootwidth}%
+ \else
+ \setlength{\@tempskipa}{\useplength{firstfoothpos}}%
+ \fi
+ \else
+ \setlength\@tempskipa{\oddsidemargin}%
+ \addtolength\@tempskipa{1in}%
+ \fi
+ \else
+ \setlength\@tempskipa{.5\paperwidth}%
+ \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}%
+ \fi
+ \showfield{\@tempskipa}%
{\useplength{firstfootvpos}}%
{\useplength{firstfootwidth}}%
{-\baselineskip}%