koma-script update (8jul09)

git-svn-id: svn://tug.org/texlive/trunk@14345 c570f23f-e606-0410-a88d-b1316a301751

37 files changed, 1314 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 3b77685b0bd..8cf0afc3f98 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
@@ -92,25 +93,35 @@
 \LetterOptionNeedsPapersize{%
   DIN%
 }{a4}
-\setkomavar*{fromzipcode}{D}
+\setkomavar*{fromzipcode}{%
+  D}
 \@setplength{foldmarkhpos}{3.5mm}
-\@setplength{tfoldmarkvpos}{105mm}
+\@setplength{tfoldmarkvpos}{%
+  105mm}
 \@setplength{mfoldmarkvpos}{\z@}
-\@setplength{bfoldmarkvpos}{210mm}
+\@setplength{bfoldmarkvpos}{%
+  210mm}
 \@setplength{lfoldmarkhpos}{\z@}
-\@setplength{toaddrvpos}{45mm}
-\@setplength{refvpos}{98.5mm}
-\@setplength{refaftervskip}{\baselineskip}
-\@setplength{toaddrhpos}{20mm}
-\@setplength{toaddrwidth}{85mm}
-\@setplength{toaddrheight}{40mm}
-\@setplength{toaddrindent}{\z@}
+\@setplength{toaddrvpos}{%
+  45mm}
+\@setplength{toaddrhpos}{%
+  20mm}
+\@setplength{toaddrwidth}{%
+  85mm}
+\@setplength{toaddrheight}{%
+  45mm}
+\@setplength{toaddrindent}{%
+  \z@}
+\@setplength{backaddrheight}{%
+  5mm}
 \@setplength{specialmailindent}{\fill}
 \@setplength{specialmailrightindent}{1em}
-\@setplength{locwidth}{\z@}
-\@setplength{backaddrheight}{5mm}
-\@setplength{firstheadvpos}{8mm}
-\@setplength{firstheadwidth}{\paperwidth}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  8mm}
+\@setplength{firstheadwidth}{%
+  \paperwidth}
 \ifdim \useplength{toaddrhpos}>\z@
   \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}}
 \else
@@ -128,6 +139,10 @@
   \@addtoplength{firstfootvpos}{\textheight}
   \@addtoplength{firstfootvpos}{\footskip}
 \fi
+\@setplength{refvpos}{%
+  98.5mm}
+\@setplength{refaftervskip}{%
+  \baselineskip}
 \@setplength{refwidth}{0pt}
 \@setplength{sigindent}{0mm}
 \@setplength{sigbeforevskip}{2\baselineskip}
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 250ea016c37..93662e1b38e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
@@ -92,25 +93,35 @@
 \LetterOptionNeedsPapersize{%
   DINmtext%
 }{a4}
-\setkomavar*{fromzipcode}{D}
+\setkomavar*{fromzipcode}{%
+  D}
 \@setplength{foldmarkhpos}{3.5mm}
-\@setplength{tfoldmarkvpos}{87mm}
+\@setplength{tfoldmarkvpos}{%
+  87mm}
 \@setplength{mfoldmarkvpos}{\z@}
-\@setplength{bfoldmarkvpos}{192mm}
+\@setplength{bfoldmarkvpos}{%
+  192mm}
 \@setplength{lfoldmarkhpos}{\z@}
-\@setplength{toaddrvpos}{27mm}
-\@setplength{refvpos}{80.5mm}
-\@setplength{refaftervskip}{\baselineskip}
-\@setplength{toaddrhpos}{20mm}
-\@setplength{toaddrwidth}{85mm}
-\@setplength{toaddrheight}{40mm}
-\@setplength{toaddrindent}{\z@}
+\@setplength{toaddrvpos}{%
+  27mm}
+\@setplength{toaddrhpos}{%
+  20mm}
+\@setplength{toaddrwidth}{%
+  85mm}
+\@setplength{toaddrheight}{%
+  45mm}
+\@setplength{toaddrindent}{%
+  \z@}
+\@setplength{backaddrheight}{%
+  5mm}
 \@setplength{specialmailindent}{\fill}
 \@setplength{specialmailrightindent}{1em}
-\@setplength{locwidth}{\z@}
-\@setplength{backaddrheight}{5mm}
-\@setplength{firstheadvpos}{8mm}
-\@setplength{firstheadwidth}{\paperwidth}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  8mm}
+\@setplength{firstheadwidth}{%
+  \paperwidth}
 \ifdim \useplength{toaddrhpos}>\z@
   \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}}
 \else
@@ -128,6 +139,10 @@
   \@addtoplength{firstfootvpos}{\textheight}
   \@addtoplength{firstfootvpos}{\footskip}
 \fi
+\@setplength{refvpos}{%
+  80.5mm}
+\@setplength{refaftervskip}{%
+  \baselineskip}
 \@setplength{refwidth}{0pt}
 \@setplength{sigindent}{0mm}
 \@setplength{sigbeforevskip}{2\baselineskip}
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 4686c8426a0..44bc058dfd0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -28,7 +28,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -63,7 +64,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
@@ -93,28 +94,42 @@
 \LetterOptionNeedsPapersize{%
   KOMAold%
 }{a4}
+\setkomavar*{fromzipcode}{%
 \@setplength{foldmarkhpos}{3.5mm}
-\@setplength{tfoldmarkvpos}{103.5mm}
+\@setplength{tfoldmarkvpos}{%
+  103.5mm}
 \@setplength{mfoldmarkvpos}{\z@}
-\@setplength{bfoldmarkvpos}{202.5mm}
+\@setplength{bfoldmarkvpos}{%
+  202.5mm}
 \@setplength{lfoldmarkhpos}{\z@}
-\@setplength{toaddrvpos}{49mm}
-\@setplength{refvpos}{89.5mm}
-\@setplength[2]{refaftervskip}{\baselineskip}
-\@setplength{toaddrhpos}{1in}
+\@setplength{toaddrvpos}{%
+  49mm}
+\@setplength{toaddrhpos}{%
+  1in}
 \@addtoplength{toaddrhpos}{\oddsidemargin}
-\@setplength{toaddrwidth}{70mm}
-\@setplength{toaddrheight}{40mm}
-\@setplength{toaddrindent}{\z@}
+\@setplength{toaddrwidth}{%
+  70mm}
+\@setplength{toaddrheight}{%
+  45mm}
+\@setplength{toaddrindent}{%
+  \z@}
+\@setplength{backaddrheight}{%
+  5mm}
 \@setplength{specialmailindent}{\fill}
 \@setplength{specialmailrightindent}{1em}
-\@setplength{locwidth}{\z@}
-\@setplength{backaddrheight}{5mm}
-\@setplength{firstheadvpos}{6mm}
-\@setplength{firstheadwidth}{\textwidth}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  6mm}
+\@setplength{firstheadwidth}{%
+  \textwidth}
 \@setplength{firstfootwidth}{\useplength{firstheadwidth}}
 \@setplength{firstfootvpos}{\paperheight}
 \@addtoplength{firstfootvpos}{-2cm}
+\@setplength{refvpos}{%
+  89.5mm}
+\@setplength{refaftervskip}{%
+  2\baselineskip}
 \@setplength{refwidth}{0pt}
 \@setplength{sigindent}{0mm}
 \@setplength{sigbeforevskip}{2\baselineskip}
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index c57f73478ad..45d952bc507 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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
new file mode 100644
index 00000000000..92fa50604b7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -0,0 +1,137 @@
+%%
+%% This is file `NF.lco',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrkvers.dtx  (with options: `trace')
+%% scrklco.dtx  (with options: `lco,NF,head')
+%% scrklco.dtx  (with options: `lco,NF,body')
+%% 
+%% Copyright (c) 1994-2009
+%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% 
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%% 
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%% 
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle.  You may however distribute the
+%% KOMA-Script bundle without all such generated files.  See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%% 
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%% 
+%% If this file is a beta version, you 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{2009/07/07 v3.04 KOMA-Script}%
+\endgroup
+%%% From File: scrklco.dtx
+\ProvidesFile{%
+  NF%
+  .lco}[\KOMAScriptVersion\space letter-class-option]
+\providecommand*\LCOWarningNoLine[2]{%
+  \LCOWarning{#1}{#2\@gobble}%
+}
+\providecommand*\LCOWarning[2]{%
+  \GenericWarning{%
+    (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces
+  }{%
+    Letter class option  #1 Warning: #2%
+  }%
+}
+%%% From File: scrklco.dtx
+\@ifundefined{scr@fromname@var}{%
+  \LCOWarningNoLine{%
+    NF%
+  }{%
+    This letter class option file was made only\MessageBreak
+    to be used with KOMA-Script letter class\MessageBreak
+    `scrlttr2'. Use with other classes may result\MessageBreak
+    in a lot of errors%
+  }%
+}{}
+\LetterOptionNeedsPapersize{%
+  NF%
+}{a4}
+\setkomavar*{fromzipcode}{%
+  F}
+\@setplength{foldmarkhpos}{3.5mm}
+\@setplength{tfoldmarkvpos}{%
+  99mm}
+\@setplength{mfoldmarkvpos}{\z@}
+\@setplength{bfoldmarkvpos}{%
+  198mm}
+\@setplength{lfoldmarkhpos}{\z@}
+\@setplength{toaddrvpos}{%
+  35mm}
+\@setplength{toaddrhpos}{%
+  -10mm}
+\@setplength{toaddrwidth}{%
+  100mm}
+\@setplength{toaddrheight}{%
+  45mm}
+\@setplength{toaddrindent}{%
+  10mm}
+\@setplength{backaddrheight}{%
+  5mm}
+\@setplength{specialmailindent}{\fill}
+\@setplength{specialmailrightindent}{1em}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  15mm}
+\@setplength{firstheadwidth}{%
+  170mm}
+\@setplength{firstfootwidth}{\useplength{firstheadwidth}}
+\@setplength{firstfootvpos}{266.679mm}
+\@setplength{refvpos}{%
+  \useplength{tfoldmarkvpos}}
+\@setplength{refaftervskip}{%
+  \baselineskip}
+\@setplength{refwidth}{0pt}
+\@setplength{sigindent}{0mm}
+\@setplength{sigbeforevskip}{2\baselineskip}
+\let\raggedsignature=\raggedright
+\endinput
+%%
+%% End of file `NF.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index 51a83867a52..0cb333cd35d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 a1bf9d03752..872f5c25947 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 902d01b9d75..a610f26c136 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 487ade6a785..f2787b2e73e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 34ee0ab2881..ce63eff245a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 489874c1781..3f1d7ddffbf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
@@ -92,25 +93,35 @@
 \LetterOptionNeedsPapersize{%
   SN%
 }{a4}
-\setkomavar*{fromzipcode}{CH}
+\setkomavar*{fromzipcode}{%
+  CH}
 \@setplength{foldmarkhpos}{3.5mm}
-\@setplength{tfoldmarkvpos}{105mm}
+\@setplength{tfoldmarkvpos}{%
+  105mm}
 \@setplength{mfoldmarkvpos}{\z@}
-\@setplength{bfoldmarkvpos}{210mm}
+\@setplength{bfoldmarkvpos}{%
+  210mm}
 \@setplength{lfoldmarkhpos}{\z@}
-\@setplength{toaddrvpos}{45mm}
-\@setplength{refvpos}{98.5mm}
-\@setplength{refaftervskip}{\baselineskip}
-\@setplength{toaddrhpos}{-8mm}
-\@setplength{toaddrwidth}{90mm}
-\@setplength{toaddrheight}{40mm}
-\@setplength{toaddrindent}{\z@}
+\@setplength{toaddrvpos}{%
+  45mm}
+\@setplength{toaddrhpos}{%
+  -8mm}
+\@setplength{toaddrwidth}{%
+  90mm}
+\@setplength{toaddrheight}{%
+  45mm}
+\@setplength{toaddrindent}{%
+  \z@}
+\@setplength{backaddrheight}{%
+  5mm}
 \@setplength{specialmailindent}{\fill}
 \@setplength{specialmailrightindent}{1em}
-\@setplength{locwidth}{\z@}
-\@setplength{backaddrheight}{5mm}
-\@setplength{firstheadvpos}{8mm}
-\@setplength{firstheadwidth}{\paperwidth}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  8mm}
+\@setplength{firstheadwidth}{%
+  \paperwidth}
 \ifdim \useplength{toaddrhpos}>\z@
   \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}}
 \else
@@ -128,6 +139,10 @@
   \@addtoplength{firstfootvpos}{\textheight}
   \@addtoplength{firstfootvpos}{\footskip}
 \fi
+\@setplength{refvpos}{%
+  98.5mm}
+\@setplength{refaftervskip}{%
+  \baselineskip}
 \@setplength{refwidth}{0pt}
 \@setplength{sigindent}{0mm}
 \@setplength{sigbeforevskip}{2\baselineskip}
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index f2db5516872..777e2a8ac7e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
@@ -92,25 +93,35 @@
 \LetterOptionNeedsPapersize{%
   SNleft%
 }{a4}
-\setkomavar*{fromzipcode}{CH}
+\setkomavar*{fromzipcode}{%
+  CH}
 \@setplength{foldmarkhpos}{3.5mm}
-\@setplength{tfoldmarkvpos}{105mm}
+\@setplength{tfoldmarkvpos}{%
+  105mm}
 \@setplength{mfoldmarkvpos}{\z@}
-\@setplength{bfoldmarkvpos}{210mm}
+\@setplength{bfoldmarkvpos}{%
+  210mm}
 \@setplength{lfoldmarkhpos}{\z@}
-\@setplength{toaddrvpos}{35.5mm}
-\@setplength{refvpos}{89mm}
-\@setplength{refaftervskip}{\baselineskip}
-\@setplength{toaddrhpos}{20mm}
-\@setplength{toaddrwidth}{100mm}
-\@setplength{toaddrheight}{40mm}
-\@setplength{toaddrindent}{\z@}
+\@setplength{toaddrvpos}{%
+  35.5mm}
+\@setplength{toaddrhpos}{%
+  20mm}
+\@setplength{toaddrwidth}{%
+  100mm}
+\@setplength{toaddrheight}{%
+  45mm}
+\@setplength{toaddrindent}{%
+  \z@}
+\@setplength{backaddrheight}{%
+  5mm}
 \@setplength{specialmailindent}{\fill}
 \@setplength{specialmailrightindent}{1em}
-\@setplength{locwidth}{\z@}
-\@setplength{backaddrheight}{5mm}
-\@setplength{firstheadvpos}{8mm}
-\@setplength{firstheadwidth}{\paperwidth}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  8mm}
+\@setplength{firstheadwidth}{%
+  \paperwidth}
 \ifdim \useplength{toaddrhpos}>\z@
   \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}}
 \else
@@ -128,6 +139,10 @@
   \@addtoplength{firstfootvpos}{\textheight}
   \@addtoplength{firstfootvpos}{\footskip}
 \fi
+\@setplength{refvpos}{%
+  89mm}
+\@setplength{refaftervskip}{%
+  \baselineskip}
 \@setplength{refwidth}{0pt}
 \@setplength{sigindent}{0mm}
 \@setplength{sigbeforevskip}{2\baselineskip}
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
new file mode 100644
index 00000000000..960e0044efc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -0,0 +1,168 @@
+%%
+%% This is file `UScommercial9.lco',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrkvers.dtx  (with options: `trace')
+%% scrklco.dtx  (with options: `lco,UScommercial9,head')
+%% scrbeta.dtx  (with options: `UScommercial9,betarelease,lco')
+%% scrklco.dtx  (with options: `lco,UScommercial9,body')
+%% 
+%% Copyright (c) 1994-2009
+%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% 
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%% 
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%% 
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle.  You may however distribute the
+%% KOMA-Script bundle without all such generated files.  See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%% 
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%% 
+%% If this file is a beta version, you 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{2009/07/07 v3.04 KOMA-Script}%
+\endgroup
+%%% From File: scrklco.dtx
+\ProvidesFile{%
+  UScommercial9
+  .lco}[\KOMAScriptVersion\space letter-class-option]
+\providecommand*\LCOWarningNoLine[2]{%
+  \LCOWarning{#1}{#2\@gobble}%
+}
+\providecommand*\LCOWarning[2]{%
+  \GenericWarning{%
+    (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces
+  }{%
+    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{%
+  UScommercial9%
+}{%
+  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
+\@ifundefined{scr@fromname@var}{%
+  \LCOWarningNoLine{%
+    UScommercial9%
+  }{%
+    This letter class option file was made only\MessageBreak
+    to be used with KOMA-Script letter class\MessageBreak
+    `scrlttr2'. Use with other classes may result\MessageBreak
+    in a lot of errors%
+  }%
+}{}
+\LetterOptionNeedsPapersize{%
+  UScommercial9%
+}{letter}
+\setkomavar*{fromzipcode}{%
+  US}
+\@setplength{foldmarkhpos}{3.5mm}
+\@setplength{tfoldmarkvpos}{%
+  3.75in}
+\@setplength{mfoldmarkvpos}{\z@}
+\@setplength{bfoldmarkvpos}{%
+  7.375in}
+\@setplength{lfoldmarkhpos}{\z@}
+\@setplength{toaddrvpos}{%
+  2.1875in}
+\@setplength{toaddrhpos}{%
+  0.6875in}
+\@setplength{toaddrwidth}{%
+  4.5in}
+\@setplength{toaddrheight}{%
+  1.125in}
+\@setplength{toaddrindent}{%
+  \z@}
+\@setplength{backaddrheight}{%
+  \z@}
+\KOMAoptions{backaddress=false}
+\@setplength{specialmailindent}{\fill}
+\@setplength{specialmailrightindent}{1em}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  .4375in}
+\@setplength{firstheadwidth}{%
+  \paperwidth}
+\ifdim \useplength{toaddrhpos}>\z@
+  \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}}
+\else
+  \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}}
+\fi
+\@setplength{firstfootwidth}{\useplength{firstheadwidth}}
+\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax
+  \@setplength{firstfootvpos}{\paperheight}
+  \@addtoplength{firstfootvpos}{-16mm}
+\else
+  \@setplength{firstfootvpos}{1in}
+  \@addtoplength{firstfootvpos}{\topmargin}
+  \@addtoplength{firstfootvpos}{\headheight}
+  \@addtoplength{firstfootvpos}{\headsep}
+  \@addtoplength{firstfootvpos}{\textheight}
+  \@addtoplength{firstfootvpos}{\footskip}
+\fi
+\@setplength{refvpos}{%
+  3.4375in}
+\@setplength{refaftervskip}{%
+  \baselineskip}
+\@setplength{refwidth}{0pt}
+\@setplength{sigindent}{0mm}
+\@setplength{sigbeforevskip}{2\baselineskip}
+\let\raggedsignature=\raggedright
+\endinput
+%%
+%% End of file `UScommercial9.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
new file mode 100644
index 00000000000..39daefef8a0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -0,0 +1,175 @@
+%%
+%% This is file `UScommercial9DW.lco',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrkvers.dtx  (with options: `trace')
+%% scrklco.dtx  (with options: `lco,UScommercial9DW,head')
+%% scrbeta.dtx  (with options: `UScommercial9DW,betarelease,lco')
+%% scrklco.dtx  (with options: `lco,UScommercial9DW,body')
+%% 
+%% Copyright (c) 1994-2009
+%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% 
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%% 
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%% 
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle.  You may however distribute the
+%% KOMA-Script bundle without all such generated files.  See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%% 
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%% 
+%% If this file is a beta version, you 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{2009/07/07 v3.04 KOMA-Script}%
+\endgroup
+%%% From File: scrklco.dtx
+\ProvidesFile{%
+  UScommercial9DW
+  .lco}[\KOMAScriptVersion\space letter-class-option]
+\providecommand*\LCOWarningNoLine[2]{%
+  \LCOWarning{#1}{#2\@gobble}%
+}
+\providecommand*\LCOWarning[2]{%
+  \GenericWarning{%
+    (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces
+  }{%
+    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{%
+  UScommercial9DW%
+}{%
+  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
+\@ifundefined{scr@fromname@var}{%
+  \LCOWarningNoLine{%
+    UScommercial9DW%
+  }{%
+    This letter class option file was made only\MessageBreak
+    to be used with KOMA-Script letter class\MessageBreak
+    `scrlttr2'. Use with other classes may result\MessageBreak
+    in a lot of errors%
+  }%
+}{}
+\LetterOptionNeedsPapersize{%
+  UScommercial9DW%
+}{letter}
+\setkomavar*{fromzipcode}{%
+  US}
+\@setplength{foldmarkhpos}{3.5mm}
+\@setplength{tfoldmarkvpos}{%
+  3.75in}
+\@setplength{mfoldmarkvpos}{\z@}
+\@setplength{bfoldmarkvpos}{%
+  7.375in}
+\@setplength{lfoldmarkhpos}{\z@}
+\@setplength{toaddrvpos}{%
+  2.1875in}
+\@setplength{toaddrhpos}{%
+  .5625in}
+\@setplength{toaddrwidth}{%
+  3.625in}
+\@setplength{toaddrheight}{%
+  1.125in}
+\@setplength{toaddrindent}{%
+  \z@}
+\@setplength{backaddrheight}{%
+  \z@}
+\KOMAoptions{backaddress=false}
+\@setplength{specialmailindent}{\fill}
+\@setplength{specialmailrightindent}{1em}
+\@setplength{locwidth}{%
+  \z@}
+\@setplength{firstheadvpos}{%
+  .4375in}
+\@setplength{firstheadwidth}{%
+  \paperwidth}
+\@addtoplength[-]{firstheadwidth}{.25in}
+\@setplength{firstfootwidth}{\useplength{firstheadwidth}}
+\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax
+  \@setplength{firstfootvpos}{\paperheight}
+  \@addtoplength{firstfootvpos}{-16mm}
+\else
+  \@setplength{firstfootvpos}{1in}
+  \@addtoplength{firstfootvpos}{\topmargin}
+  \@addtoplength{firstfootvpos}{\headheight}
+  \@addtoplength{firstfootvpos}{\headsep}
+  \@addtoplength{firstfootvpos}{\textheight}
+  \@addtoplength{firstfootvpos}{\footskip}
+\fi
+\@setplength{refvpos}{%
+  3.4375in}
+\@setplength{refaftervskip}{%
+  \baselineskip}
+\@setplength{refwidth}{0pt}
+\@setplength{sigindent}{0mm}
+\@setplength{sigbeforevskip}{2\baselineskip}
+\let\raggedsignature=\raggedright
+\newcommand*{\showUSletterCixDW}{%
+  \showUScommercial9[{%
+    \thicklines
+    \usekomafont{envelope}%
+    \measuredIFrame({\dimexpr (\paperwidth-
+                         \expandafter\dimexpr \useplength{firstheadwidth}\relax%
+                       )/2\relax},%
+                    -\expandafter\dimexpr\useplength{firstheadvpos}\relax)%
+                   (3.5in,.875in)%
+  }]%
+}
+\endinput
+%%
+%% End of file `UScommercial9DW.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index a1b3503553d..190f14f4aa2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -40,7 +41,7 @@
 %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
 %% 
 %%% From File: scrhack.dtx
-\ProvidesFile{float.hck}
+\ProvidesFile{float.hak}
                 [\KOMAScriptVersion\space
                   hacking package
                   float]
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index d61ebe3c1d5..ce83f8132b2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -40,7 +41,7 @@
 %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
 %% 
 %%% From File: scrhack.dtx
-\ProvidesFile{hyperref.hck}
+\ProvidesFile{hyperref.hak}
                 [\KOMAScriptVersion\space
                   hacking package
                   hyperref]
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index f7633f34446..db774c2627e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -40,7 +41,7 @@
 %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
 %% 
 %%% From File: scrhack.dtx
-\ProvidesFile{listings.hck}
+\ProvidesFile{listings.hak}
                 [\KOMAScriptVersion\space
                   hacking package
                   listings]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index 8b828b58b18..b05fe4bb581 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 078afad0640..ab3d1fe0a3d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -59,7 +59,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -94,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrartcl%
@@ -108,7 +109,7 @@
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/01/20 v3.02a}
+\def\tocbasicversion{2009/06/08 v3.03b}
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 \addtotoclist{toc}
@@ -170,8 +171,10 @@
 \@namedef{scr@v@3.02}{9}
 \@namedef{scr@v@3.02b}{9}
 \@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{0}
-\@namedef{scr@v@3.03a}{0}
+\@namedef{scr@v@3.03}{10}
+\@namedef{scr@v@3.03a}{10}
+\@namedef{scr@v@3.03b}{10}
+\@namedef{scr@v@3.04}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 1a1edb5c52a..e64f3683f59 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -31,7 +31,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -66,7 +67,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrkbase.dtx
 \ProvidesPackage{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 22020c4c848..8268961f4d5 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -59,7 +59,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -94,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrbook%
@@ -108,7 +109,7 @@
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/01/20 v3.02a}
+\def\tocbasicversion{2009/06/08 v3.03b}
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -172,8 +173,10 @@
 \@namedef{scr@v@3.02}{9}
 \@namedef{scr@v@3.02b}{9}
 \@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{0}
-\@namedef{scr@v@3.03a}{0}
+\@namedef{scr@v@3.03}{10}
+\@namedef{scr@v@3.03a}{10}
+\@namedef{scr@v@3.03b}{10}
+\@namedef{scr@v@3.04}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -1806,7 +1809,9 @@
   \thechapter\autodot\enskip}
 \newcounter{section}[chapter]
 \renewcommand*\thesection{%
-  \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
+  \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d} % the space before this
+                                % comment should be \relax but hyperref has a
+                                % not documented problem with \relax
     \if@mainmatter\thechapter.\fi
   \else
   \thechapter.%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 2cc89ae6edf..b7928126424 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 8ba1f771d57..1b2c5c4c2b4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -48,7 +48,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -116,7 +117,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
@@ -207,8 +208,10 @@
 \@namedef{scr@v@3.02}{9}
 \@namedef{scr@v@3.02b}{9}
 \@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{0}
-\@namedef{scr@v@3.03a}{0}
+\@namedef{scr@v@3.03}{10}
+\@namedef{scr@v@3.03a}{10}
+\@namedef{scr@v@3.03b}{10}
+\@namedef{scr@v@3.04}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -1169,6 +1172,8 @@
   }%
   \item\relax%
 }
+\newkomafont{labelinglabel}{}
+\newkomafont{labelingseparator}{}
 %%% From File: scrlogo.dtx
 \@ifundefined{KOMAScript}{%
   \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 666930d791e..97215b5b0aa 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -30,7 +30,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -65,7 +66,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrhack.dtx
 %%% using: package,identify
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 389e8db6888..6474b900bb2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -29,7 +29,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -64,7 +65,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 e276d02f9b7..3784416ab91 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 76cfdf87d1a..85f0523314e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -58,7 +58,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -93,7 +94,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrlttr2%
@@ -162,8 +163,10 @@
 \@namedef{scr@v@3.02}{9}
 \@namedef{scr@v@3.02b}{9}
 \@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{0}
-\@namedef{scr@v@3.03a}{0}
+\@namedef{scr@v@3.03}{10}
+\@namedef{scr@v@3.03a}{10}
+\@namedef{scr@v@3.03b}{10}
+\@namedef{scr@v@3.04}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -2830,7 +2833,6 @@
             \addtolengthplength[-]{\@tempskipa}{toaddrwidth}%
           \fi
           \hskip\@tempskipa
-          \@addtoplength{toaddrheight}{\useplength{backaddrheight}}%
           \@savevbox{\useplength{toaddrheight}}{\hsize\useplength{toaddrwidth}%
             \@savevbox[\vss]{\useplength{backaddrheight}}{%
               \hsize\useplength{toaddrwidth}%
@@ -2871,9 +2873,9 @@
               \usekomafont{addressee}{%
                 \usekomafont{toname}{\usekomavar{toname}\\}%
                 \usekomafont{toaddress}{\usekomavar{toaddress}}}}%
-            \vfil\null}%
+            \vfil\null\vskip-\baselineskip}%
           {address field}{toaddrheight}%
-          {\string\begin{letter} or you\MessageBreak
+          {\begin{letter} or you\MessageBreak
             have to define a smaller special purpose using\MessageBreak
             \string\specialmail}%
         }}}%
@@ -3001,7 +3003,7 @@
               \vbox to \useplength{PPheadheight}{%
                 \addtolengthplength[-2]{\hsize}{toaddrindent}%
                 \setlength{\parindent}{0pt}%
-                \usekomavar{addresseimage}%
+                \usekomavar{addresseeimage}%
                 \vss
               }%
               \vskip 1mm
@@ -3071,7 +3073,6 @@
     \fi
     \ifdim \useplength{locheight}=\z@%
       \@setplength{locheight}{\useplength{toaddrheight}}%
-      \@addtoplength{locheight}{\useplength{backaddrheight}}%
     \fi
     \move@topt\vskip\useplength{locvpos}%
     \vb@t@z{\noindent\makebox[0pt][l]{%
@@ -3523,7 +3524,7 @@
 \newkomavar{fromzipcode}
 \newkomavar{PPcode}
 \newkomavar{PPdatamatrix}
-\newkomavar{addresseimage}
+\newkomavar{addresseeimage}
 \newkomavar[\usekomavar{place}]{placeseparator}
 \setkomavar{placeseparator}{,~}
 \newkomavar[\subjectname]{subjectseparator}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
index fb23e254015..5af0a98001a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 16694958e30..7a629dec9ae 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 5ed2b935ddc..5ab4d4f180b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -59,7 +59,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -94,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrreprt%
@@ -108,7 +109,7 @@
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/01/20 v3.02a}
+\def\tocbasicversion{2009/06/08 v3.03b}
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -172,8 +173,10 @@
 \@namedef{scr@v@3.02}{9}
 \@namedef{scr@v@3.02b}{9}
 \@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{0}
-\@namedef{scr@v@3.03a}{0}
+\@namedef{scr@v@3.03}{10}
+\@namedef{scr@v@3.03a}{10}
+\@namedef{scr@v@3.03b}{10}
+\@namedef{scr@v@3.04}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 480d1a66c2a..1518b0f7b33 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 b3292a50468..5e9e181233b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 f2068eca843..ebc3fe270dc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -27,7 +27,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -62,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 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 f49e9cf42a7..bcd57e06f59 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -26,7 +26,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index b186dabe9e4..b94b548d2af 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -39,11 +39,11 @@
 %% standard classes created by The LaTeX3 Project 1994-1996.
 %% 
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2009/01/20 v3.02a}
+\def\tocbasicversion{2009/06/08 v3.03b}
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{tocbasic}
-                [\tocbasicversion
-                (package)%
+                [\tocbasicversion\space KOMA-Script package
+                (handling toc-files)%
                 ]
 \newcommand*{\tb@listoftocs}{}
 \newcommand{\ifattoclist}[1]{%
@@ -207,7 +207,7 @@
   \doforeachtocfile[{#1}]{\addtocontents{\@currext}{#2}}%
 }
 \newcommand{\@@addtoeachtocfile}[1]{%
-  \doforeachfocfile{\addtocontents{\@currext}{#1}}%
+  \doforeachtocfile{\addtocontents{\@currext}{#1}}%
 }
 \newcommand{\addcontentslinetoeachtocfile}{%
   \@ifnextchar [%]
@@ -280,7 +280,7 @@
   \doforeachtocfile[{#1}]{\listoftoc{\@currext}}%
 }
 \newcommand{\@@listofeachtoc}[1]{%
-  \doforeachfocfile{\listoftoc{\@currext}}%
+  \doforeachtocfile{\listoftoc{\@currext}}%
 }
 \newcommand*{\tocbasic@listhead}[1]{%
   \@ifundefined{tocbasic@listhead@\@currext}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 4de71cc2ee9..7f603de9fe7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -32,7 +32,8 @@
 %% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
 %% additional information.
 %% 
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
 %% ----------------------------------------------------------
@@ -67,7 +68,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}%
 \endgroup
 %%% From File: scrktare.dtx
 \ProvidesPackage{typearea}[%
@@ -597,8 +598,10 @@
 \@namedef{scr@v@3.02}{9}
 \@namedef{scr@v@3.02b}{9}
 \@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{0}
-\@namedef{scr@v@3.03a}{0}
+\@namedef{scr@v@3.03}{10}
+\@namedef{scr@v@3.03a}{10}
+\@namedef{scr@v@3.03b}{10}
+\@namedef{scr@v@3.04}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrktare.dtx
 \InputIfFileExists{typearea.cfg}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
new file mode 100644
index 00000000000..34c03ea20f6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -0,0 +1,564 @@
+%%
+%% This is file `visualize.lco',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% 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-2009
+%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% 
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%% 
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%% 
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle.  You may however distribute the
+%% KOMA-Script bundle without all such generated files.  See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%% 
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'.  See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%% 
+%% If this file is a beta version, you 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{2009/07/07 v3.04 KOMA-Script}%
+\endgroup
+%%% From File: scrklco.dtx
+\ProvidesFile{%
+  visualize%
+  .lco}[\KOMAScriptVersion\space letter-class-option]
+\providecommand*\LCOWarningNoLine[2]{%
+  \LCOWarning{#1}{#2\@gobble}%
+}
+\providecommand*\LCOWarning[2]{%
+  \GenericWarning{%
+    (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces
+  }{%
+    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]{%
+  \AtBeginLetter{%
+    \begingroup
+      \@for \@tempa:=#1\do{%
+        \ifx\@tempa\@empty\else
+          \@ifundefined{showfield@\@tempa}{%
+            \LCOWarning{visualize}{Unknown field `\@tempa' ignored}%
+          }{%
+            \edef\@tempa{%
+              \noexpand\AddToShipoutPicture*{%
+                \noexpand\AtPageUpperLeft{%
+                  \noexpand\usekomafont{field}%
+                  \noexpand\@nameuse{showfield@\@tempa}%
+                }%
+              }%
+            }\@tempa
+          }%
+        \fi
+      }%
+    \endgroup
+  }%
+}
+\newkomafont{field}{\normalcolor}
+\newcommand*{\showfield@by@frame}[4]{%
+  \thinlines
+  \ifdim #4<\z@
+    \put(\LenToUnit{#1},-\LenToUnit{#2}){\line(1,0){\LenToUnit{#3}}}%
+    \setlength{\@tempdima}{\dimexpr #1+#3\relax}%
+    \setlength{\@tempdimb}{#4}
+    \put(\LenToUnit{#1},-\LenToUnit{#2}){%
+      \vector(0,-1){\LenToUnit{-\@tempdimb}}}%
+    \put(\LenToUnit\@tempdima,-\LenToUnit{#2}){%
+      \vector(0,-1){\LenToUnit{-\@tempdimb}}}%
+  \else
+    \put(\LenToUnit{#1},-\LenToUnit{#2}){\line(1,0){\LenToUnit{#3}}}%
+    \put(\LenToUnit{#1},-\LenToUnit{#2}){\line(0,-1){\LenToUnit{#4}}}%
+    \setlength{\@tempdima}{\dimexpr #1+#3\relax}%
+    \setlength{\@tempdimb}{\dimexpr #2+#4\relax}%
+    \put(\LenToUnit\@tempdima,\LenToUnit{-\@tempdimb}){%
+      \line(-1,0){\LenToUnit{#3}}}%
+    \put(\LenToUnit\@tempdima,\LenToUnit{-\@tempdimb}){%
+      \line(0,1){\LenToUnit{#4}}}%
+  \fi
+}
+\newcommand*{\showfield@by@edges}[4]{%
+  \thinlines
+  \setlength{\@tempdima}{\dimexpr #1+#3\relax}%
+  \put(\LenToUnit{#1},-\LenToUnit{#2}){\line(1,0){\LenToUnit{\edgesize}}}%
+  \put(\LenToUnit{#1},-\LenToUnit{#2}){\line(0,-1){\LenToUnit{\edgesize}}}%
+  \put(\LenToUnit{\@tempdima},-\LenToUnit{#2}){\line(-1,0){\LenToUnit{\edgesize}}}%
+  \put(\LenToUnit{\@tempdima},-\LenToUnit{#2}){\line(0,-1){\LenToUnit{\edgesize}}}%
+  \ifdim #4<\z@\else
+    \setlength{\@tempdimb}{\dimexpr #2+#4\relax}%
+    \put(\LenToUnit{#1},-\LenToUnit{\@tempdimb}){\line(1,0){\LenToUnit{\edgesize}}}%
+    \put(\LenToUnit{#1},-\LenToUnit{\@tempdimb}){\line(0,1){\LenToUnit{\edgesize}}}%
+    \put(\LenToUnit{\@tempdima},-\LenToUnit{\@tempdimb}){\line(-1,0){\LenToUnit{\edgesize}}}%
+    \put(\LenToUnit{\@tempdima},-\LenToUnit{\@tempdimb}){\line(0,1){\LenToUnit{\edgesize}}}%
+  \fi
+}
+\newcommand*{\edgesize}{1ex}
+\newcommand*{\showfield@by@rule}[4]{%
+  \ifdim #4<\z@
+    \put(\LenToUnit{#1},-\LenToUnit{#2}){\rule[#4]{#3}{-#4}}%
+  \else
+    \put(\LenToUnit{#1},-\LenToUnit{#2}){\rule[-#4]{#3}{#4}}%
+  \fi
+}
+\newcommand*{\showfield}{}
+\let\showfield\showfield@by@frame
+\newcommand*{\setshowstyle}[1]{%
+  \@ifundefined{showfield@by@#1}{%
+    \LCOWarning{visualize}{Unknown show type `#1'.\MessageBreak
+      You should simply set one of the supported\MessageBreak
+      show types `frame', `edge', `rule'.\MessageBreak
+      Style `frame' will be used instead}%
+    \let\showfield\showfield@by@frame
+  }{%
+    \expandafter\let\expandafter\showfield\csname showfield@by@#1\endcsname
+  }%
+}
+\newcommand*{\showfield@test}{%
+  \showfield{1cm}{1cm}{10cm}{15cm}%
+}
+\newcommand*{\showfield@head}{%
+  \showfield{\dimexpr (\paperwidth-\useplength{firstheadwidth})/2\relax}%
+            {\useplength{firstheadvpos}}%
+            {\useplength{firstheadwidth}}%
+            {-\headheight}%
+}
+\newcommand*{\showfield@foot}{%
+  \showfield{\dimexpr (\paperwidth-\useplength{firstfootwidth})/2\relax}%
+            {\useplength{firstfootvpos}}%
+            {\useplength{firstfootwidth}}%
+            {-\baselineskip}%
+}
+\newcommand*{\showfield@address}{%
+  \setlengthtoplength{\@tempskipa}{toaddrhpos}%
+  \ifdim \@tempskipa<\z@
+    \addtolength{\@tempskipa}{\paperwidth}%
+    \addtolengthplength[-]{\@tempskipa}{toaddrwidth}%
+  \fi
+  \showfield{\@tempskipa}{\useplength{toaddrvpos}}%
+            {\useplength{toaddrwidth}}%
+            {\dimexpr\useplength{toaddrheight}+
+                      \useplength{backaddrheight}\relax}%
+}
+\newcommand*{\showfield@location}{%
+  \begingroup
+    \ifdim \useplength{locwidth}=\z@%
+      \@setplength{locwidth}{\paperwidth}%
+      \ifdim \useplength{toaddrhpos}>\z@
+        \@addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}%
+      \else
+        \@addtoplength[2]{locwidth}{\useplength{toaddrhpos}}%
+      \fi
+      \@addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}%
+      \if@bigloc%
+        \@setplength[.66667]{locwidth}{\useplength{locwidth}}%
+      \else%
+        \@setplength[.5]{locwidth}{\useplength{locwidth}}%
+      \fi%
+    \fi%
+    \ifdim \useplength{lochpos}=\z@%
+      \@setplength{lochpos}{\useplength{toaddrhpos}}%
+    \fi
+    \ifdim \useplength{locvpos}=\z@%
+      \@setplength{locvpos}{\useplength{toaddrvpos}}%
+    \fi
+    \ifdim \useplength{locheight}=\z@%
+      \@setplength{locheight}{\useplength{toaddrheight}}%
+      \@addtoplength{locheight}{\useplength{backaddrheight}}%
+    \fi
+    \setlengthtoplength[-]{\@tempskipa}{lochpos}%
+    \ifdim \@tempskipa<\z@
+      \addtolength{\@tempskipa}{\paperwidth}%
+    \else
+      \addtolengthplength{\@tempskipa}{locwidth}%
+    \fi
+    \addtolengthplength[-]{\@tempskipa}{locwidth}%
+    \showfield{\@tempskipa}{\useplength{locvpos}}%
+              {\useplength{locwidth}}{\useplength{locheight}}%
+  \endgroup
+}
+\newcommand*{\showfield@refline}{%
+  \begingroup
+    \ifdim\useplength{refwidth}=\z@
+      \if@refwide
+        \@setplength{refwidth}{\paperwidth}%
+        \ifdim \useplength{toaddrhpos}>\z@
+          \@setplength{refhpos}{\useplength{toaddrhpos}}%
+        \else
+          \@setplength[-]{refhpos}{\useplength{toaddrhpos}}%
+        \fi
+        \@addtoplength[-2]{refwidth}{\useplength{refhpos}}%
+      \else
+        \@setplength{refwidth}{\textwidth}%
+        \@setplength{refhpos}{\oddsidemargin}%
+        \@addtoplength{refhpos}{1in}%
+      \fi
+    \else\ifdim\useplength{refhpos}=\z@
+        \begingroup
+          \setlength\@tempdima{\textwidth}%
+          \addtolengthplength[-]{\@tempdima}{refwidth}%
+          \setlength\@tempdimb{\oddsidemargin}%
+          \addtolength\@tempdimb{1in}%
+          \setlength{\@tempdimc}{\paperwidth}%
+          \addtolength{\@tempdimc}{-\textwidth}%
+          \divide\@tempdimb by 32768\relax
+          \divide\@tempdimc by 32768\relax
+          \ifdim\@tempdimc=\z@\else
+            \multiply\@tempdima by\@tempdimb
+            \divide\@tempdima by\@tempdimc
+          \fi
+          \edef\@tempa{\noexpand\endgroup
+            \noexpand\@setplength{refhpos}{\the\@tempdima}}%
+        \@tempa
+    \fi\fi
+    \showfield{\useplength{refhpos}}{\useplength{refvpos}}%
+              {\useplength{refwidth}}{-1.5\baselineskip}%
+  \endgroup
+}
+\@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}}
+\newcommand*{\showenvelope}{}
+\newcommand*{\@@showenvelope}{}
+\newcommand*{\@@@showenvelope}{}
+\def\showenvelope(#1,#2){%
+  \@ifnextchar (%)
+    {\@showenvelope({#1},{#2})}%
+    {\@@@showenvelope({#1},{#2})}%
+}
+\def\@@@showenvelope(#1,#2){%
+  \begingroup
+    \def\@tempa{\endgroup}%
+    \ifdim \paperwidth>#1\relax
+      \LCOWarning{visualize}{%
+        \string\paperwidth\space > envelope width not supported}%
+    \else
+      \ifdim \paperheight>#2\relax
+        \ifdim .5\paperheight>#2\relax
+          \expandafter\ifdim \useplength{tfoldmarkvpos}>#2\relax
+            \LCOWarning{visualize}{%
+              tfoldmarkvpos > envelope height not supported}%
+          \else
+            \def\@tempa{\endgroup
+              \@showenvelope({#1},{#2})%
+                            ({\dimexpr (#1-\paperwidth)/2\relax},%
+                             {\dimexpr (#2-\expandafter\dimexpr
+                                        \useplength{tfoldmarkvpos}\relax)%
+                                       /2\relax})%
+            }%
+          \fi
+        \else
+          \def\@tempa{\endgroup
+            \@showenvelope({#1},{#2})%
+                          ({\dimexpr (#1-\paperwidth)/2\relax},%
+                           {\dimexpr (#2-.5\paperheight)/2\relax})%
+          }%
+        \fi
+      \else
+        \def\@tempa{\endgroup
+          \@showenvelope({#1},{#2})%
+                        ({\dimexpr (#1-\paperwidth)/2\relax},%
+                         {\dimexpr (#2-\paperheight)/2\relax})%
+        }%
+      \fi
+    \fi
+  \@tempa
+}
+\def\@showenvelope(#1,#2)(#3,#4){%
+  \@ifnextchar [%]
+    {\@@showenvelope({#1},{#2})({#3},{#4})}%
+    {\@@showenvelope({#1},{#2})({#3},{#4})[]}%
+}
+\def\@@showenvelope(#1,#2)(#3,#4)[#5]{%
+  \newpage
+  \vspace*{\fill}
+  \rotatebox{90}{%
+    \begin{picture}(0,0)
+      \begin{picture}(\LenToUnit{#1},\LenToUnit{#2})(0,\LenToUnit{#2})
+        \newcommand*{\PlusHOffset}[1]{%
+          \dimexpr \expandafter\dimexpr ##1\relax + #3\relax
+        }%
+        \newcommand*{\MinusHOffset}[1]{%
+          \dimexpr \expandafter\dimexpr ##1\relax - #3\relax
+        }%
+        \newcommand*{\PlusVOffset}[1]{%
+          \dimexpr \expandafter\dimexpr ##1\relax + #4\relax
+        }%
+        \newcommand*{\MinusVOffset}[1]{%
+          \dimexpr \expandafter\dimexpr ##1\relax - #4\relax
+        }%
+        \newcommand{\AtEnvelopeUpperLeft}[1]{%
+          \put(\LenToUnit{\PlusHOffset\z@},\LenToUnit{\MinusVOffset{#2}}){##1}%
+        }%
+        \newcommand{\AtEnvelopeLowerLeft}[1]{%
+          \put(\LenToUnit{\PlusHOffset\z@},\LenToUnit{\PlusVOffset\z@}){##1}%
+        }%
+        \newcommand{\AtEnvelopeUpperRight}[1]{%
+          \put(\LenToUnit{\MinusHOffset{#1}},\LenToUnit{\MinusVOffset{#2}}){##1}%
+        }%
+        \newcommand{\AtEnvelopeLowerRight}[1]{%
+          \put(\LenToUnit{\MinusHOffset{#1}},\LenToUnit{\PlusVOffset\z@}){##1}%
+        }%
+        \newcommand*{\measuredIFrame}{}%
+        \def\measuredIFrame(##1,##2)(##3,##4){%
+          \put(\LenToUnit{##1},\LenToUnit{##2}){%
+            \measuredFrameLB({##3},{##4})%
+          }%
+          \put(\LenToUnit{\MinusHOffset\z@},%
+               \LenToUnit{\dimexpr ##2-.5mm\relax}){%
+            \measureLineHB{\PlusHOffset{##1}}%
+          }%
+          \put(\LenToUnit{\dimexpr ##1+##3\relax},%
+              \LenToUnit{\dimexpr ##2-.5mm\relax}){%
+            \measureLineHB{\dimexpr #1-%
+                             \PlusHOffset{\dimexpr ##1+##3\relax}\relax}%
+          }%
+          \put(\LenToUnit{\dimexpr ##1-.5mm\relax},%
+               \LenToUnit{\dimexpr ##2+##4\relax}){%
+            \measureLineVL{\PlusVOffset{\dimexpr -##2-##4\relax}}%
+          }%
+          \put(\LenToUnit{\dimexpr ##1-.5mm\relax},%
+               \LenToUnit{\PlusVOffset{-#2}}){%
+            \measureLineVL{\dimexpr #2-%
+              \PlusVOffset{\dimexpr -##2\relax}\relax}%
+          }%
+        }%
+        \put(0,0){%
+          \thicklines
+          \usekomafont{envelope}%
+          \measuredFrameLB({#1},{#2})%
+        }%
+        \AtEnvelopeLowerLeft{%
+          \usekomafont{letter}%
+          \dashbox{\LenToUnit{1mm}}%
+                  (\LenToUnit{\MinusHOffset{\MinusHOffset{#1}}},%
+                   \LenToUnit{\MinusVOffset{\MinusVOffset{#2}}}){}%
+        }%
+        \expandafter\ifdim \useplength{toaddrhpos}<\z@
+          \AtEnvelopeUpperLeft{%
+            \thicklines
+            \usekomafont{envelope}%
+            \measuredIFrame(\expandafter\dimexpr \useplength{toaddrhpos}+
+                              \MinusHOffset{\MinusHOffset{#1}}\relax,%
+                            -\dimexpr %
+                              \expandafter\dimexpr\useplength{toaddrvpos}\relax
+                              +
+                              \expandafter
+                                \dimexpr\useplength{toaddrheight}\relax
+                              \relax)%
+                           (\useplength{toaddrwidth},\useplength{toaddrheight})%
+          }%
+        \else
+          \AtEnvelopeUpperLeft{%
+            \thicklines
+            \usekomafont{envelope}%
+            \measuredIFrame(\useplength{toaddrhpos},%
+                            -\dimexpr %
+                              \expandafter\dimexpr\useplength{toaddrvpos}\relax
+                              +
+                              \expandafter
+                                \dimexpr\useplength{toaddrheight}\relax
+                              \relax)%
+                           (\useplength{toaddrwidth},\useplength{toaddrheight})%
+          }%
+        \fi
+        \AtEnvelopeUpperLeft{#5}%
+      \end{picture}
+    \end{picture}
+  }%
+  \newpage
+}
+\newkomafont{envelope}{\normalcolor}
+\newkomafont{letter}{\normalcolor}
+\newcommand*{\unmeasuredFrame}{}
+\def\unmeasuredFrame(#1,#2){%
+  \put(0,0){\line(1,0){\LenToUnit{#1}}}%
+  \put(\LenToUnit{#1},0){\line(0,1){\LenToUnit{#2}}}%
+  \put(\LenToUnit{#1},\LenToUnit{#2}){\line(-1,0){\LenToUnit{#1}}}%
+  \put(0,\LenToUnit{#2}){\line(0,-1){\LenToUnit{#2}}}%
+}
+\newcommand*{\measuredFrameLB}{}
+\def\measuredFrameLB(#1,#2){%
+  \unmeasuredFrame({#1},{#2})%
+  \put(\LenToUnit{-.5mm},0){\measureLineVL{#2}}%
+  \put(0,\LenToUnit{-.5mm}){\measureLineHB{#1}}%
+}
+\newcommand*{\measuredFrameLT}{}
+\def\measuredFrameLT(#1,#2){%
+  \unmeasuredFrame({#1},{#2})%
+  \put(\LenToUnit{-.5mm},0){\measureLineVL{#2}}%
+  \put(0,\LenToUnit{\expandafter\dimexpr #2+.5mm\relax}){\measureLineHT{#1}}%
+}
+\newcommand*{\measuredFrameRB}{}
+\def\measuredFrameRB(#1,#2){%
+  \unmeasuredFrame({#1},{#2})%
+  \put(\LenToUnit{\expandafter\dimexpr #1+.5mm\relax},0){\measureLineVR{#2}}%
+  \put(0,\LenToUnit{-.5mm}){\measureLineHB{#1}}%
+}
+\newcommand*{\measuredFrameRT}{}
+\def\measuredFrameRT(#1,#2){%
+  \unmeasuredFrame({#1},{#2})%
+  \put(\LenToUnit{\expandafter\dimexpr #1+.5mm\relax},0){\measureLineVR{#2}}%
+  \put(0,\LenToUnit{\expandafter\dimexpr #2+.5mm\relax}){\measureLineHT{#1}}%
+}
+\newcommand*{\measureLineV}[1]{%
+  \begin{picture}(0,0)
+    \thinlines
+    \usekomafont{measure}%
+    \put(0,0){\vector(0,1){\LenToUnit{#1}}}%
+    \put(0,\LenToUnit{#1}){\vector(0,-1){\LenToUnit{#1}}}%
+ \end{picture}
+}
+\newcommand*{\measureLineVL}[1]{%
+  \begin{picture}(0,0)
+    \usekomafont{measure}%
+    \put(0,0){\measureLineV{#1}}%
+    \put(0,0){\makebox(0,\LenToUnit{#1})[r]{\ValPerUnit{#1}}}%
+  \end{picture}
+}
+\newcommand*{\measureLineVR}[1]{%
+  \begin{picture}(0,0)
+    \usekomafont{measure}%
+    \put(0,0){\measureLineV{#1}}%
+    \put(0,0){\makebox(0,\LenToUnit{#1})[l]{\ValPerUnit{#1}}}%
+  \end{picture}
+}
+\newcommand*{\ValPerUnit}[1]{%
+  \begingroup
+    \setlength{\@tempdima}{%
+      \dimexpr #1/(\unitlength/\unitfactor)*\p@/\unitfactor\relax
+    }%
+    \strip@pt\@tempdima
+  \endgroup
+}
+\newcommand*{\unitfactor}{1}
+\newcommand*{\measureLineH}[1]{%
+  \begin{picture}(0,0)
+    \usekomafont{measure}%
+    \put(0,0){\vector(1,0){\LenToUnit{#1}}}%
+    \put(\LenToUnit{#1},0){\vector(-1,0){\LenToUnit{#1}}}%
+ \end{picture}
+}
+\newcommand*{\measureLineHB}[1]{%
+  \begin{picture}(0,0)
+    \usekomafont{measure}%
+    \put(0,0){\measureLineH{#1}}%
+    \put(0,\LenToUnit{\dimexpr -\ht\strutbox-.5mm\relax}){%
+      \makebox(\LenToUnit{#1},\LenToUnit{\baselineskip})[c]{\ValPerUnit{#1}}}%
+  \end{picture}
+}
+\newcommand*{\measureLineHT}[1]{%
+  \begin{picture}(0,0)
+    \usekomafont{measure}%
+    \put(0,0){\measureLineH{#1}}%
+    \put(0,0){%
+      \makebox(\LenToUnit{#1},\LenToUnit{\baselineskip})[c]{\ValPerUnit{#1}}}%
+  \end{picture}
+}
+\newkomafont{measure}{\normalcolor}
+\newcommand*{\showISOenvelope}[1]{%
+  \ifstr{#1}{C4}{%
+    \showenvelope(324mm,229mm)%
+  }{%
+    \ifstr{#1}{C5}{%
+      \showenvelope(229mm,162mm)%
+    }{%
+      \ifstr{#1}{C5/6}{%
+        \showenvelope(220mm,110mm)%
+      }{%
+        \ifstr{#1}{DL}{%
+          \showenvelope(220mm,110mm)%
+        }{%
+          \ifstr{#1}{C6/5}{%
+            \showenvelope(229mm,114mm)%
+          }{%
+            \ifstr{#1}{C6}{%
+              \showenvelope(162mm,114mm)%
+            }{%
+              \LCOWarning{visualize}{envelope size `ISO #1' unsupported}%
+            }%
+          }%
+        }%
+      }%
+    }%
+  }%
+}
+\newcommand*{\showUScommercial}[1]{%
+  \ifstr{#1}{9}{%
+    \showenvelope(8.875in,3.875in)%
+  }{%
+    \ifstr{#1}{10}{%
+      \showenvelope(9.5in,4.125in)%
+    }{%
+      \LCOWarning{visualize}{envelope size `US commercial #1' unsupported}%
+    }%
+  }%
+}
+\newcommand*{\showUScheck}{%
+  \showenvelope(8.625in,3.625in)%
+}
+%%% From File: scrknpap.dtx
+\endinput
+%%
+%% End of file `visualize.lco'.