From 024228db99693079b2ebbc9aff20e89811eb8810 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Apr 2011 23:06:06 +0000 Subject: koma-script (5apr11) git-svn-id: svn://tug.org/texlive/trunk@21983 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/koma-script/README | 4 +- .../texmf-dist/doc/latex/koma-script/manifest.txt | 2 +- .../texmf-dist/doc/latex/koma-script/scrguide.html | 1148 ++++++++++---------- .../texmf-dist/doc/latex/koma-script/scrguide.pdf | Bin 2241197 -> 2249687 bytes .../texmf-dist/doc/latex/koma-script/scrguien.html | 2 +- .../texmf-dist/doc/latex/koma-script/scrguien.pdf | Bin 1657916 -> 1658679 bytes .../texmf-dist/doc/latex/koma-script/scrhack.pdf | Bin 291498 -> 291498 bytes .../texmf-dist/doc/latex/koma-script/scrjura.pdf | Bin 337432 -> 337432 bytes .../texmf-dist/doc/latex/koma-script/tocstyle.pdf | Bin 231421 -> 231431 bytes .../texmf-dist/source/latex/koma-script/ChangeLog | 144 +++ .../texmf-dist/source/latex/koma-script/Makefile | 1 + .../latex/koma-script/doc/english/scrdatetime.tex | 8 +- .../latex/koma-script/doc/english/tocbasic.tex | 88 +- .../source/latex/koma-script/doc/guide.bib | 16 +- .../doc/ngerman/scrbookreportarticle.tex | 55 +- .../latex/koma-script/doc/ngerman/scrdatetime.tex | 15 +- .../latex/koma-script/doc/ngerman/scrlfile.tex | 54 +- .../koma-script/doc/ngerman/scrlttr2-experts.tex | 58 +- .../latex/koma-script/doc/ngerman/scrlttr2.tex | 60 +- .../source/latex/koma-script/scrbeta.dtx | 3 +- .../source/latex/koma-script/scrkbase.dtx | 11 +- .../source/latex/koma-script/scrkcomp.dtx | 10 +- .../source/latex/koma-script/scrkfloa.dtx | 102 +- .../source/latex/koma-script/scrkfont.dtx | 404 ++++++- .../source/latex/koma-script/scrklang.dtx | 40 +- .../source/latex/koma-script/scrknpap.dtx | 147 ++- .../source/latex/koma-script/scrkplen.dtx | 4 +- .../source/latex/koma-script/scrkvars.dtx | 14 +- .../source/latex/koma-script/scrkvers.dtx | 2 +- .../source/latex/koma-script/scrlfile.dtx | 96 +- .../source/latex/koma-script/scrmain.ins | 11 + .../source/latex/koma-script/scrtime.dtx | 24 +- .../source/latex/koma-script/tocbasic.dtx | 187 +++- .../source/latex/koma-script/tocstyle.dtx | 3 +- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 2 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 2 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 2 +- .../tex/latex/koma-script/UScommercial9.lco | 2 +- .../tex/latex/koma-script/UScommercial9DW.lco | 2 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 67 +- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 10 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 67 +- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 11 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 10 +- .../tex/latex/koma-script/scrfontsizes.sty | 367 +++++++ .../texmf-dist/tex/latex/koma-script/scrhack.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 4 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 55 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 154 ++- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 67 +- .../tex/latex/koma-script/scrsize10pt.clo | 2 +- .../tex/latex/koma-script/scrsize11pt.clo | 2 +- .../tex/latex/koma-script/scrsize12pt.clo | 2 +- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 2 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 52 +- .../texmf-dist/tex/latex/koma-script/tocstyle.sty | 3 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 4 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 2 +- 67 files changed, 2604 insertions(+), 1020 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/koma-script/README b/Master/texmf-dist/doc/latex/koma-script/README index e4ad8dffc70..a8bb87e214a 100644 --- a/Master/texmf-dist/doc/latex/koma-script/README +++ b/Master/texmf-dist/doc/latex/koma-script/README @@ -1,6 +1,6 @@ -KOMA-Script 2011/02/19 v3.08a -Copyright (c) Markus Kohm , 1994-2009 +KOMA-Script 2011/04/02 v3.09 +Copyright (c) Markus Kohm , 1994-2011 This material is subject to the LaTeX Project Public License. See lppl.txt (english) or lppl-de.txt (german) for the details of that diff --git a/Master/texmf-dist/doc/latex/koma-script/manifest.txt b/Master/texmf-dist/doc/latex/koma-script/manifest.txt index 397bca8fe53..b687cad98ff 100644 --- a/Master/texmf-dist/doc/latex/koma-script/manifest.txt +++ b/Master/texmf-dist/doc/latex/koma-script/manifest.txt @@ -35,7 +35,7 @@ % Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. % ====================================================================== % -% CONTENTS OF THE KOMA-SCRIPT RELEASE 2011/02/19 v3.08a +% CONTENTS OF THE KOMA-SCRIPT RELEASE 2011/04/02 v3.09 % ------------------------------------------------------ % % diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguide.html b/Master/texmf-dist/doc/latex/koma-script/scrguide.html index f691d1d8858..d50ad0b574b 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrguide.html +++ b/Master/texmf-dist/doc/latex/koma-script/scrguide.html @@ -10,597 +10,605 @@
  • Optionen
  • Anweisungen
  • Umgebungen
  • Pseudolängen
  • Variablen
  • Seitenstile
  • Zähler
  • Stile für das float-Paket
  • Optionen

    Anweisungen

    Umgebungen

    Pseudolängen

    Variablen

    Seitenstile

    Zähler

    Stile für das float-Paket

    \tocbasic@@before@hook --> 242

  • \tocbasic@extend@babel --> 242
  • \tocbasic@listhead --> 242
  • -
  • \tocbasic@listhead@ --> 242
  • +
  • \tocbasic@listhead@ --> 243
  • \tocbasic@starttoc --> 242
  • \tocbasicautomode --> 235
  • \typearea --> 30
  • diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf b/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf index 7936b82ea93..46dfbc9aea2 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf b/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf index 6fc3f0024f3..0dd817331fb 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf b/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf index 09fd21f3690..72332d12430 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf b/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf index 2adb9899bef..0a19786d625 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf and b/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf differ diff --git a/Master/texmf-dist/source/latex/koma-script/ChangeLog b/Master/texmf-dist/source/latex/koma-script/ChangeLog index 88efdc43e91..5022d3b18bf 100644 --- a/Master/texmf-dist/source/latex/koma-script/ChangeLog +++ b/Master/texmf-dist/source/latex/koma-script/ChangeLog @@ -1,3 +1,147 @@ +r1079 2011-04-05 09:05:02 +0200 mjk: + + * releaselist.txt: release 2011/04/02 v3.09 + +r1077 2011-04-05 08:58:11 +0200 mjk: + + * scrkvers.dtx, scrkcomp.dtx: prepared for 3.09 + +r1076 2011-04-05 08:52:55 +0200 mjk: + + * TODO, doc/, doc/guide.bib, doc/ngerman/, + doc/ngerman/scrbookreportarticle.tex: neue Werte für Option captions + dokumentiert + +r1075 2011-04-02 07:54:03 +0200 mjk: + + * scrkfloa.dtx: new values for option "captions" + +r1074 2011-04-01 10:27:22 +0200 mjk: + + * scrkbase.dtx: fix: \Family@@Numical@@Key --> \Family@@String@@Key + +r1073 2011-03-31 10:27:18 +0200 mjk: + + * tocstyle.dtx: one comment changed + +r1072 2011-03-31 10:24:16 +0200 mjk: + + * scrtime.dtx: one % added + +r1071 2011-03-31 10:21:23 +0200 mjk: + + * scrkvars.dtx: only indents changed + +r1070 2011-03-31 10:19:27 +0200 mjk: + + * scrkplen.dtx: only one indent changed + +r1069 2011-03-31 10:08:05 +0200 mjk: + + * scrkbase.dtx: \FamilyStringKey and \FamilyNumericalKey fixed (thanks + to Michael Pock) + +r1068 2011-03-23 19:10:35 +0100 mjk: + + * TODO: neue Optionen und Anweisungen + +r1067 2011-03-23 19:03:00 +0100 mjk: + + * tocbasic.dtx: todays change fixed + +r1066 2011-03-23 18:51:49 +0100 mjk: + + * scrkfloa.dtx: new options `captions=top', `captions=bot', + `captions=figureabove', `captions=figurebelow' new commands + `\captionaboveof' and `\captionsbelowof' + +r1065 2011-03-23 15:46:02 +0100 mjk: + + * tocbasic.dtx: *** empty log message *** + +r1064 2011-03-23 15:45:43 +0100 mjk: + + * tocbasic.dtx: options "atbegin" and "atend" added to \DeclareNewTOC + +r1063 2011-03-10 09:38:30 +0100 mjk: + + * TODO: new entry + +r1062 2011-03-10 09:37:34 +0100 mjk: + + * doc/, doc/ngerman/, doc/ngerman/scrlttr2-experts.tex: Neue Sprache, + naustrian, dokumentiert + +r1061 2011-03-10 09:28:23 +0100 mjk: + + * scrklang.dtx: scrlttr2 supports language naustrian + +r1060 2011-03-09 12:46:48 +0100 mjk: + + * doc/, doc/ngerman/, doc/ngerman/scrlfile.tex: Dokumentation von + \AfterClass!, \AfterPackage!, \AfterAtEndOfClass, + \AfterAtEndOfPackage + +r1059 2011-03-09 12:44:04 +0100 mjk: + + * scrlfile.dtx: new: \AfterClass!, \AfterPackage!, \AfterAtEndOfClass, + \AfterAtEndOfPackage + +r1058 2011-03-08 19:48:43 +0100 mjk: + + * doc/, doc/ngerman/, doc/ngerman/scrlfile.tex: Tippfehler korrigiert + +r1057 2011-03-08 18:29:55 +0100 mjk: + + * scrlfile.dtx, doc/, doc/ngerman/, doc/ngerman/scrlfile.tex: new + commands \AfterClass+ and \AfterPackage+ that wait until loading of + class or package has been finished + +r1056 2011-03-07 10:50:55 +0100 mjk: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrlttr2.tex: alte + Font-Elemente refname und refvalue dokumentiert; neue Werte + dateleft, dateright, nodate für Option refline dokumentiert + +r1055 2011-03-07 09:38:43 +0100 mjk: + + * TODO, scrknpap.dtx: new values dateleft, dateright, and nodate for + option refline + +r1054 2011-03-06 11:14:05 +0100 mjk: + + * TODO: missing docu of font elements `refname' and `refvalue' + +r1053 2011-03-01 13:45:55 +0100 mjk: + + * tocbasic.dtx: loop in using \@currext fixed + +r1051 2011-02-23 18:48:29 +0100 mjk: + + * scrkfont.dtx, scrbeta.dtx, Makefile, scrmain.ins: new package + scrfontsizes.sty for generation of KOMA-Script compatible font + sizefiles + +r1050 2011-02-22 11:56:51 +0100 mjk: + + * doc/, doc/ngerman/, doc/ngerman/scrdatetime.tex: scrdate supports + austrian and naustrian now + +r1049 2011-02-22 11:39:28 +0100 mjk: + + * scrtime.dtx, doc/, doc/english/, doc/english/scrdatetime.tex, + doc/ngerman/, doc/ngerman/scrdatetime.tex: scrdate supports austrian + and naustrian now + +r1048 2011-02-22 10:15:41 +0100 mjk: + + * scrkfont.dtx: \@listiv, \@listv, and \listvi fixed at + \changefontsizes + +r1046 2011-02-22 09:40:35 +0100 mjk: + + * scrkvers.dtx, scrkcomp.dtx: prepared for 3.08b BETA + r1045 2011-02-19 10:50:59 +0100 mjk: * releaselist.txt: release 2011/02/19 v3.08a diff --git a/Master/texmf-dist/source/latex/koma-script/Makefile b/Master/texmf-dist/source/latex/koma-script/Makefile index e40c9544eb8..82173b330d6 100644 --- a/Master/texmf-dist/source/latex/koma-script/Makefile +++ b/Master/texmf-dist/source/latex/koma-script/Makefile @@ -110,6 +110,7 @@ CLS_MAIN = scrbook.cls \ float.hak \ hyperref.hak \ listings.hak \ + scrfontsizes.sty \ visualize.lco \ DIN.lco \ DINmtext.lco \ diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex index da85e498399..2b0bcfe659e 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex @@ -45,7 +45,7 @@ % % ============================================================================ -\ProvidesFile{scrdatetime.tex}[{2009/01/01 KOMA-Script guide (chapter: +\ProvidesFile{scrdatetime.tex}[{2011/02/22 KOMA-Script guide (chapter: scrdate, scrtime)}] \translator{Gernot Hassenpflug\and Markus Kohm} @@ -129,9 +129,9 @@ be changed to \PName{name} by using \Macro{nameday}. \end{Example} \EndIndex{Cmd}{nameday} -Currently the package \Package{scrdate} knows the languages english -(english, american, USenglish, UKenglish and british), german (german, -ngerman and austrian), french, italian, spanish, croatian, finnish, and +Currently the package \Package{scrdate} knows the languages english (english, +american, USenglish, UKenglish and british), german (german, ngerman, +austrian, and naustrian), french, italian, spanish, croatian, finnish, and norsk. If you want to configure it for other languages, see \File{scrdate.dtx}. diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex index 78f7d83d496..177077a168c 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex @@ -6,7 +6,7 @@ %% %% tocbasic.dtx (with options: `doc') %% -%% Copyright (c) 2007-2010 +%% Copyright (c) 2007-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -38,7 +38,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/10/01 v3.07a} +\def\tocbasicversion{2011/03/23 v3.09} \ProvidesFile{tocbasic.tex} [\tocbasicversion\space KOMA-Script package (manual)% @@ -534,56 +534,62 @@ prior sections for more informations about this. The optional parameter \PName{options} is a comma separated list of \emph{key}=\emph{value} pairs. \begin{description} -\item[\normalfont\PValue{owner}=\PName{string}]\hfill\\* - The owner as described in the sections before. If no owner was given owner - \PValue{float} will be used. -\item[\normalfont\PValue{type}=\PName{string}]\hfill\\* - sets the type of the new declared list. The type will be used e.g. to - defined a \Macro{listof}\PName{string}. If no type is set up the extension - from the mandatory argument will be used. -\item[\normalfont\PValue{types}=\PName{string}]\hfill\\* - the plural of the type. If no plural was given the value of \PValue{type} - with postfix ``s'' will be used. -\item[\normalfont\PValue{name}=\PName{string}]\hfill\\* - The name of an element. If no name is given, the value of \PValue{type} with - upper case first char will be used. -\item[\normalfont\PValue{listname}=\PName{string}]\hfill\\* - The name of the list of foo. If not given the value of \PValue{types} with - upper case first char prefixed by ``List of '' will be used. -\item[\normalfont\PValue{forcenames}]\hfill\\* - If set, the names will be even defined, if they where already defined - before. -\item[\normalfont\PValue{level}=\PName{number}]\hfill\\* - The level of the entries of that list. If not given level 1 will be used - like standard classes use for entries to list of figures or list of tables. -\item[\normalfont\PValue{indent}=\PName{length}]\hfill\\* - The indent value for the entries of that list. If not given, 1\,em will be - used like standard classes use for entries to list of figures or list of - tables. -\item[\normalfont\PValue{hang}=\PName{length}]\hfill\\* - The amount of the hanging indent of the entries for that list. If not given, - 1.5\,em will be used like standard classes use for entries to list of - figures or list of tables. +\item[\normalfont\PValue{atbegin}=\PName{code}]\hfill\\* + The \PName{code} will be executed at the begin of the float or nonfloat + environment. +\item[\normalfont\PValue{atend}=\PName{code}]\hfill\\* + The \PName{code} will be executed at the end of the float or nonfloat + environment. +\item[\normalfont\PValue{counterwithin}=\PName{parent counter}]\hfill\\* + If you define a float or nonfloat, the captions will be numbered. You may + declare another counter to be the parent counter. In this case, the parent + counter will be set before the float counter and the float counter will be + reset whenever the parent counter is increased using \Macro{stepcounter} + oder \Macro{refstepcounter}. \item[\normalfont\PValue{float}]\hfill\\* If set, float environments for that type will be defined. The names of the environments are the value of \PName{type} and for double column floats the value of \PName{type} with postfix ``\PValue{*}''. +\item[\normalfont\PValue{floatpos}=\PName{float positions}]\hfill\\* + The default floating-position of the float. If no float position was given, + ``tbp'' will be used like the standard classes do for figures and tables. \item[\normalfont\PValue{floattype}=\PName{number}]\hfill\\* The numericle float type of the defined floats. Float types with common bits cannot be reordered. At the standard classes figures has float type 1 and tables has float type 2. If no float type was given, 16 will be used. -\item[\normalfont\PValue{floatpos}=\PName{float positions}]\hfill\\* - The default floating-position of the float. If no float position was given, - ``tbp'' will be used like the standard classes do for figures and tables. +\item[\normalfont\PValue{forcenames}]\hfill\\* + If set, the names will be even defined, if they where already defined + before. +\item[\normalfont\PValue{hang}=\PName{length}]\hfill\\* + The amount of the hanging indent of the entries for that list. If not given, + 1.5\,em will be used like standard classes use for entries to list of + figures or list of tables. +\item[\normalfont\PValue{indent}=\PName{length}]\hfill\\* + The indent value for the entries of that list. If not given, 1\,em will be + used like standard classes use for entries to list of figures or list of + tables. +\item[\normalfont\PValue{level}=\PName{number}]\hfill\\* + The level of the entries of that list. If not given level 1 will be used + like standard classes use for entries to list of figures or list of tables. +\item[\normalfont\PValue{listname}=\PName{string}]\hfill\\* + The name of the list of foo. If not given the value of \PValue{types} with + upper case first char prefixed by ``List of '' will be used. +\item[\normalfont\PValue{name}=\PName{string}]\hfill\\* + The name of an element. If no name is given, the value of \PValue{type} with + upper case first char will be used. \item[\normalfont\PValue{nonfloat}]\hfill\\* If set, a non floating environment will be defined. The name of the environment is the value of \PName{type} with postfix ``\PValue{-}''. -\item[\normalfont\PValue{counterwithin}=\PName{parent counter}]\hfill\\* - If you define a float or nonfloat, the captions will be numbered. You may - declare another counter to be the parent counter. In this case, the parent - counter will be set before the float counter and the float counter will be - reset whenever the parent counter is increased using \Macro{stepcounter} - oder \Macro{refstepcounter}. +\item[\normalfont\PValue{owner}=\PName{string}]\hfill\\* + The owner as described in the sections before. If no owner was given owner + \PValue{float} will be used. +\item[\normalfont\PValue{type}=\PName{string}]\hfill\\* + sets the type of the new declared list. The type will be used e.g. to + defined a \Macro{listof}\PName{string}. If no type is set up the extension + from the mandatory argument will be used. +\item[\normalfont\PValue{types}=\PName{string}]\hfill\\* + the plural of the type. If no plural was given the value of \PValue{type} + with postfix ``s'' will be used. \end{description} \subsection{Internal Commands for Class and Package Authors} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/guide.bib b/Master/texmf-dist/source/latex/koma-script/doc/guide.bib index b5701cf4c7b..808f8db7ece 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/guide.bib +++ b/Master/texmf-dist/source/latex/koma-script/doc/guide.bib @@ -614,12 +614,22 @@ document classes}, language = {english}, author = {David Carlise}, title = {The {\Package{longtable}} package}, - year = 1998, - month = may, - edition = {4.09}, + year = 2004, + month = feb, + edition = {4.11}, url = {CTAN://macros/latex/required/tools/} } +@Misc{ package:tabu, + language = {english}, + author = {Florent Chervet}, + title = {tabu and longtabu}, + year = 2011, + month = feb, + edition = {2.8}, + url = {CTAN://macros/latex/contrib/tabu/} +} + @Misc{ package:ragged2e, language = {english}, author = {Martin Schröder}, diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex index f05bc6710e6..078ef547b6e 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex @@ -45,7 +45,7 @@ % % ============================================================================ -\ProvidesFile{scrbookreportarticle.tex}[2011/01/22 KOMA-Script guide (chapter: +\ProvidesFile{scrbookreportarticle.tex}[2011/04/02 KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \chapter{Die Hauptklassen \Class{scrbook}, \Class{scrreprt}, \Class{scrartcl}} @@ -2432,6 +2432,7 @@ an dieser Stelle darauf hingewiesen, dass mehrseitige Tabellen nicht als Gleitumgebungen gesetzt werden können. Für den automatischen Seitenumbruch von Tabellen werden außerdem Zusatzpakete wie \Package{longtable}\IndexPackage{longtable} (siehe \cite{package:longtable}) +oder \Package{tabu}\IndexPackage{tabu} (siehe \cite{package:tabu}) benötigt. Mit der Einstellung @@ -2444,6 +2445,17 @@ allein vom Ort ab, an dem die Anweisung \Macro{caption} verwendet wird. Dies ändert sich ggf. bei Verwendung des Pakets \Package{float}\IndexPackage{float} mit der Anweisung \Macro{restylefloats} (siehe \cite{package:float}). +Natürlich existiert\ChangedAt{v3.09}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} mit den Optionen +\OptionValue{captions}{figureheading}\IndexOption{captions~=figureheading} und +\OptionValue{captions}{figuresignature}\IndexOption{captions~=figuresignature} +auch die entsprechende Funktion für Abbildungen. Um gleichzeitig die +Formatierung für alle Gleitumgebungen ändern zu können, gibt es außerdem die +Optionen \OptionValue{captions}{heading}\IndexOption{captions~=heading} und +\OptionValue{captions}{signature}\IndexOption{captions~=signature}. Diese +entfalten ihre Wirkung auch noch, wenn sie innerhalb einer Gleitumgebung +verwendet werden. + Bitte\OnlyAt{\Package{float}}\IndexPackage{float} beachten Sie, dass bei Verwendung des \Package{float}-Pakets die Einstellungen \OptionValue{captions}{tableheadings} und @@ -2483,7 +2495,6 @@ Einstellungen f \caption[]{Mögliche Werte für Option \Option{captions} (\emph{Fortsetzung})}\\ \Endhead% - \standardfoot% \entry{\PValue{bottombeside}, \PValue{besidebottom}}{% Gleitumgebungstitel der Umgebung \Environment{captionsbeside} (siehe \autoref{sec:maincls.floats}, @@ -2498,6 +2509,22 @@ Einstellungen f \autopageref{desc:maincls.env.captionbeside}) werden zum Inhalt der Gleitumgebung vertikal zentriert ausgerichtet.% \IndexOption{captions~=centeredbeside}}% + \entry{\PValue{figureheading}, \PValue{figureabove}, \PValue{abovefigure}, + \PValue{topatfigure}% + \IndexOption{captions~=figureheading}}{% + \ChangedAt{v3.09}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Bei Abbildungen wird (ggf. abweichend von + \OptionValue{captions}{signature}) die Formatierung als Überschrift + gewählt.}% + \entry{\PValue{figuresignature}, \PValue{belowfigure}, + \PValue{bottomatfiggure}% + \IndexOption{captions~=figuresignature}}{% + \ChangedAt{v3.09}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Bei Abbildungen wird (ggf. abweichend von + \OptionValue{captions}{heading}) die Formatierung als Unterschrift + gewählt.}% \entry{\PValue{innerbeside}, \PValue{besideinner}\IndexOption{captions~=innerbeside}}{% Gleitumgebungstitel der Umgebung \Environment{captionsbeside} (siehe @@ -2506,6 +2533,14 @@ Einstellungen f doppelseitigem Satz in der Voreinstellung innen neben dem Inhalt der Gleitumgebung gesetzt. Dies entspricht im einseitigen Satz \OptionValue{captions}{leftbeside}.}% + \entry{\PValue{heading}, \PValue{above}, \PValue{top}% + \IndexOption{captions~=heading}}{% + \ChangedAt{v3.09}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Gleitumgebungstitel werden als Überschriften formatiert. Dies hat jedoch + keinen Einfluss darauf ob sie über oder unter der Gleitumgebung platziert + werden. Die Option impliziert auch \OptionValue{captions}{tableheading} + und \OptionValue{captions}{figureheading}.}% \entry{\PValue{leftbeside}, \PValue{besideleft}\IndexOption{captions~=leftbeside}}{% Gleitumgebungstitel der Umgebung \Environment{captionsbeside} (siehe @@ -2534,14 +2569,26 @@ Einstellungen f \autoref{sec:maincls.floats}, \autopageref{desc:maincls.env.captionbeside}) werden in der Voreinstellung rechts neben dem Inhalt der Gleitumgebung gesetzt.}% + \entry{\PValue{signature}, \PValue{below}, \PValue{bot}, \PValue{bottom}% + \IndexOption{captions~=signature}}{% + \ChangedAt{v3.09}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Gleitumgebungstitel werden als Unterschriften formatiert. Dies hat jedoch + keinen Einfluss darauf ob sie über oder unter der Gleitumgebung platziert + werden. Die Option impliziert auch \OptionValue{captions}{tablesignature} + und \OptionValue{captions}{figuresignature}.}% \entry{\PValue{tableheading}, \PValue{tableabove}, \PValue{abovetable}, \PValue{abovetabular}, \PValue{topattable}% \IndexOption{captions~=tableheading}}{% - Bei Tabellen wird die Formatierung als Überschrift gewählt.}% + Bei Tabellen wird (ggf. abweichend von + \OptionValue{captions}{signature}) die Formatierung als Überschrift + gewählt.}% \entry{\PValue{tablesignature}, \PValue{belowtable}, \PValue{belowtabular}, \PValue{bottomattable}% \IndexOption{captions~=tablesignature}}{% - Bei Tabellen wird die Formatierung als Unterschrift gewählt.}% + Bei Tabellen wird (ggf. abweichend von + \OptionValue{captions}{heading}) die Formatierung als Unterschrift + gewählt.}% \entry{\PValue{topbeside}, \PValue{besidetop}}{% Gleitumgebungstitel der Umgebung \Environment{captionsbeside} (siehe \autoref{sec:maincls.floats}, diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrdatetime.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrdatetime.tex index 88e4643cbbb..add74210375 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrdatetime.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrdatetime.tex @@ -45,7 +45,7 @@ % % ============================================================================ -\ProvidesFile{scrdatetime.tex}[{2011/01/18 KOMA-Script guide (chapter: +\ProvidesFile{scrdatetime.tex}[{2011/02/22 KOMA-Script guide (chapter: scrdate, scrtime)}] \chapter{Wochentag und Uhrzeit mit \Package{scrdate} und \Package{scrtime}} @@ -305,13 +305,14 @@ Anweisungen.% \EndIndex{Cmd}{nameday} -\minisec{Wochentage in unterschiedlichen Sprachen} +\minisec{Wochentage in unterschiedlichen Sprachen}% Das \Package{scrdate}-Paket beherrscht derzeit die Sprachen Englisch (english -und USenglish), Deutsch (german, ngerman und austrian), Französisch (french), -Italienisch (italian), Spanisch (spanish), Kroatisch (croatian), Finnisch -(finnish), Norwegisch (norsk), Schwedisch (swedish) und Dänisch (danish), kann -aber auch für andere Sprachen konfiguriert werden. Näheres dazu entnehme man -\File{scrdate.dtx}. +und USenglish), Deutsch (german, ngerman, +austrian\ChangedAt{v3.08b}{\Package{scrdate}} und naustrian), Französisch +(french), Italienisch (italian), Spanisch (spanish), Kroatisch (croatian), +Finnisch (finnish), Norwegisch (norsk), Schwedisch (swedish) und Dänisch +(danish), kann aber auch für andere Sprachen konfiguriert werden. Näheres dazu +entnehme man \File{scrdate.dtx}. Bei der aktuellen Version ist es egal, ob \Package{scrdate} vor oder nach \Package{german}\IndexPackage{german}, \Package{babel}\IndexPackage{babel} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlfile.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlfile.tex index 5ceb03b12d1..56cae1a84c6 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlfile.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlfile.tex @@ -45,7 +45,7 @@ % % ============================================================================ -\ProvidesFile{scrlfile.tex}[2011/01/20 KOMA-Script guide (chapter: scrlfile)] +\ProvidesFile{scrlfile.tex}[2011/03/09 KOMA-Script guide (chapter: scrlfile)] \chapter{Paketabhängigkeiten mit \Package{scrlfile} beherrschen} @@ -190,23 +190,51 @@ seinem Namen und nicht mit seinem Dateinamen angegeben wird. Die Endungen \BeginIndex{Cmd}{AfterClass}% \BeginIndex{Cmd}{AfterClass*}% +\BeginIndex{Cmd}{AfterClass+}% +\BeginIndex{Cmd}{AfterClass!}% +\BeginIndex{Cmd}{AfterAtEndOfClass}% \BeginIndex{Cmd}{AfterPackage}% \BeginIndex{Cmd}{AfterPackage*}% +\BeginIndex{Cmd}{AfterPackage+}% +\BeginIndex{Cmd}{AfterPackage!}% +\BeginIndex{Cmd}{AfterAtEndOfPackage}% \begin{Declaration} \Macro{AfterClass}\Parameter{Klasse}\Parameter{Anweisungen}\\ + \Macro{AfterAtEndOfClass}\Parameter{Klasse}\Parameter{Anweisungen}\\ \Macro{AfterClass*}\Parameter{Klasse}\Parameter{Anweisungen}\\ + \Macro{AfterClass+}\Parameter{Klasse}\Parameter{Anweisungen}\\ + \Macro{AfterClass!}\Parameter{Klasse}\Parameter{Anweisungen}\\ \Macro{AfterPackage}\Parameter{Paket}\Parameter{Anweisungen}\\ - \Macro{AfterPackage*}\Parameter{Paket}\Parameter{Anweisungen} + \Macro{AfterPackage*}\Parameter{Paket}\Parameter{Anweisungen}\\ + \Macro{AfterPackage+}\Parameter{Paket}\Parameter{Anweisungen}\\ + \Macro{AfterPackage!}\Parameter{Paket}\Parameter{Anweisungen}\\ + \Macro{AfterAtEndOfPackage}\Parameter{Klasse}\Parameter{Anweisungen} \end{Declaration}% Die Anweisungen \Macro{AfterClass} und \Macro{AfterPackage} arbeiten weitgehend wie \Macro{AfterFile} mit dem winzigen Unterschied, dass die -\PName{Klasse} beziehungsweise das \PName{Paket} mit seinem Namen und -nicht mit seinem Dateinamen angegeben wird. Die Endungen »\File{.cls}« -und »\File{.sty}« entfallen hier also. Bei den Sternvarianten gibt es -eine zusätzliche Funktionalität. Ist die entsprechende Klasse oder das -entsprechende Paket bereits geladen, so werden die \PName{Anweisungen} -nicht nach dem nächsten Laden, sondern unmittelbar ausgeführt.% - +\PName{Klasse} beziehungsweise das \PName{Paket} mit seinem Namen und nicht +mit seinem Dateinamen angegeben wird. Die Endungen »\File{.cls}« und +»\File{.sty}« entfallen hier also. Bei den Sternvarianten gibt es eine +zusätzliche Funktionalität. Wurde oder wird die entsprechende Klasse oder das +entsprechende Paket bereits geladen, so werden die \PName{Anweisungen} nicht +nach dem nächsten Laden, sondern unmittelbar ausgeführt. Bei der +Plusvariante\ChangedAt{v3.09}{\Package{scrlfile}} werden die +\PName{Anweisungen} sicher erst dann ausgeführt, wenn die Klasse oder das +Paket vollständig geladen wurden. Der Unterschied zwischen der Stern- und der +Plusvariante kommt nur zum Tragen, wenn die Anweisung verwendet wird, wenn das +Laden der Klassen bzw. des Pakets zwar bereits begonnen hat, aber noch nicht +beendet wurde. Wenn das Laden der Klasse bzw. des Pakets noch nicht +abgeschlossen wurde, werden die \PName{Anweisungen} in allen Fällen vor den +in der Klasse bzw. dem Paket mit \Macro{AtEndOfClass} oder +\Macro{AtEndOfPackage} verzögerten Anweisungen ausgeführt. Um stattdessen +eine Ausführung danach sicher zu stellen, ist die Variante mit Ausrufezeichen +zu verwenden. In diesem Fall werden die \PName{Anweisungen} nicht mehr im +Kontext der angegebenen Klasse bzw. des angegebenen Pakets ausgeführt. Will +man genau dies nur für den Fall erreichen, dass die Klasse bzw. das Paket +noch nicht geladen wurde, so verwendet man die Anweisung +\Macro{AfterAtEndOfClass}\ChangedAt{v3.09}{\Package{scrlfile}} +bzw. \Macro{AfterAtEndOfPackage}.% +% \begin{Example} Als Beispiel für Paket- oder Klassenautoren will ich zunächst erklären, wie \KOMAScript{} selbst Gebrauch von den neuen @@ -239,7 +267,7 @@ nicht nach dem n \begin{lstcode} \AfterPackage{caption2}{% \renewcommand*{\setcapindent}{% -\end{lstcode} +\end{lstcode}% }} Nach dem Laden von \Package{caption2} und nur falls das Paket geladen wird, wird hier die \KOMAScript-Anweisung \Macro{setcapindent} umdefiniert. Der Inhalt der Umdefinierung ist @@ -308,8 +336,14 @@ Optionen \Option{dvips} oder \Option{pdftex}, eingef % \EndIndex{Cmd}{AfterClass}% \EndIndex{Cmd}{AfterClass*}% +\EndIndex{Cmd}{AfterClass+}% +\EndIndex{Cmd}{AfterClass!}% +\EndIndex{Cmd}{AfterAtEndOfClass}% \EndIndex{Cmd}{AfterPackage}% \EndIndex{Cmd}{AfterPackage*}% +\EndIndex{Cmd}{AfterPackage+}% +\EndIndex{Cmd}{AfterPackage!}% +\EndIndex{Cmd}{AfterAtEndOfPackage}% \BeginIndex{Cmd}{BeforeClosingMainAux}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex index f7a63799cfb..cb77ce7b97a 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex @@ -45,7 +45,7 @@ % % ============================================================================ -\ProvidesFile{scrlttr2-experts.tex}[2011/01/20 KOMA-Script guide (chapter: scrlttr2 for experts)] +\ProvidesFile{scrlttr2-experts.tex}[2011/03/10 KOMA-Script guide (chapter: scrlttr2 for experts)] \chapter{Zusätzliche Informationen zur Briefklasse \Class{scrlttr2}} @@ -1475,15 +1475,17 @@ Implementierungsgrenzen. \section{Unterstützung verschiedener Sprachen} \label{sec:scrlttr2-experts.languages}% \BeginIndex{}{Sprachen}% -Die Klasse \Class{scrlttr2} unterstützt viele Sprachen. Dazu zählen -Deutsch (\PValue{german} für alte deutsche Rechtschreibung, -\PValue{ngerman} für neue deutsche Rechtschreibung und -\PValue{austrian} für Österreichisch), Englisch (\PValue{english} ohne -Angabe, ob amerikanisches oder britisches Englisch, \PValue{american} und -\PValue{USenglish} für Amerikanisch, \PValue{british} und -\PValue{UKenglish} für Britisch), Französisch, Italienisch, Spanisch, -Niederländisch, Kroatisch, Finnisch, -Norwegisch\ChangedAt{v3.02}{\Class{scrlttr2}} und Schwedisch\ChangedAt{v3.08}{\Class{scrlttr2}}. +Die Klasse \Class{scrlttr2} unterstützt viele Sprachen. Dazu zählen Deutsch +(\PValue{german} für alte deutsche Rechtschreibung, \PValue{ngerman} für neue +deutsche Rechtschreibung, \PValue{austrian} für Österreichisch mit alter +deutscher Rechtschreibung und +\PValue{naustrian}\ChangedAt{v3.09}{\Class{scrlttr2}} für Österreichisch mit +neuer deutscher Rechtschreibung), Englisch (\PValue{english} ohne Angabe, ob +amerikanisches oder britisches Englisch, \PValue{american} und +\PValue{USenglish} für Amerikanisch, \PValue{british} und \PValue{UKenglish} +für Britisch), Französisch, Italienisch, Spanisch, Niederländisch, Kroatisch, +Finnisch, Norwegisch\ChangedAt{v3.02}{\Class{scrlttr2}} und +Schwedisch\ChangedAt{v3.08}{\Class{scrlttr2}}. Zwischen den Sprachen wird bei Verwendung des \Package{babel}-Paketes\IndexPackage{babel} (siehe \cite{package:babel}) mit @@ -1571,6 +1573,7 @@ Option explizit angegeben wird, dass \Package{babel} das \Macro{captionsgerman}\\ \Macro{captionsngerman}\\ \Macro{captionsaustrian}\\ + \Macro{captionsnaustrian}\\ \Macro{captionsfrench}\\ \Macro{captionsitalian}\\ \Macro{captionsspanish}\\ @@ -1584,7 +1587,7 @@ Option explizit angegeben wird, dass \Package{babel} das \BeginIndex{Cmd}{captionsamerican}\BeginIndex{Cmd}{captionsbritish}% \BeginIndex{Cmd}{captionsUKenglish}% \BeginIndex{Cmd}{captionsgerman}\BeginIndex{Cmd}{captionsngerman}% -\BeginIndex{Cmd}{captionsaustrian}% +\BeginIndex{Cmd}{captionsaustrian}\BeginIndex{Cmd}{captionsnaustrian}% \BeginIndex{Cmd}{captionsfrench}% \BeginIndex{Cmd}{captionsitalian}% \BeginIndex{Cmd}{captionsspanish}% @@ -1601,13 +1604,14 @@ Anweisungen notfalls auch direkt verwendet werden.% % \EndIndex{Cmd}{captionsswedish}% \EndIndex{Cmd}{captionsnorsk}% -\EndIndex{Cmd}{captionsenglish}\EndIndex{Cmd}{captionsUSenglish} -\EndIndex{Cmd}{captionsamerican}\EndIndex{Cmd}{captionsbritish} -\EndIndex{Cmd}{captionsUKenglish}\EndIndex{Cmd}{captionsgerman} -\EndIndex{Cmd}{captionsngerman} -\EndIndex{Cmd}{captionsaustrian}\EndIndex{Cmd}{captionsfrench} -\EndIndex{Cmd}{captionsitalian}\EndIndex{Cmd}{captionsspanish} -\EndIndex{Cmd}{captionsdutch}\EndIndex{Cmd}{captionscroatian} +\EndIndex{Cmd}{captionsenglish}\EndIndex{Cmd}{captionsUSenglish}% +\EndIndex{Cmd}{captionsamerican}\EndIndex{Cmd}{captionsbritish}% +\EndIndex{Cmd}{captionsUKenglish}\EndIndex{Cmd}{captionsgerman}% +\EndIndex{Cmd}{captionsngerman}% +\EndIndex{Cmd}{captionsaustrian}\EndIndex{Cmd}{captionsnaustrian}% +\EndIndex{Cmd}{captionsfrench}% +\EndIndex{Cmd}{captionsitalian}\EndIndex{Cmd}{captionsspanish}% +\EndIndex{Cmd}{captionsdutch}\EndIndex{Cmd}{captionscroatian}% \EndIndex{Cmd}{captionsfinnish}% @@ -1620,6 +1624,7 @@ Anweisungen notfalls auch direkt verwendet werden.% \Macro{dategerman}\\ \Macro{datengerman}\\ \Macro{dateaustrian}\\ + \Macro{datenaustrian}\\ \Macro{datefrench}\\ \Macro{dateitalian}\\ \Macro{datespanish}\\ @@ -1629,12 +1634,13 @@ Anweisungen notfalls auch direkt verwendet werden.% \Macro{datenorsk}\\ \Macro{dateswedish} \end{Declaration} -\BeginIndex{Cmd}{dateenglish}\BeginIndex{Cmd}{dateUSenglish} -\BeginIndex{Cmd}{dateamerican}\BeginIndex{Cmd}{datebritish} -\BeginIndex{Cmd}{dateUKenglish}\BeginIndex{Cmd}{dategerman} -\BeginIndex{Cmd}{datengerman} -\BeginIndex{Cmd}{dateaustrian}\BeginIndex{Cmd}{datefrench} -\BeginIndex{Cmd}{dateitalian}\BeginIndex{Cmd}{datespanish} +\BeginIndex{Cmd}{dateenglish}\BeginIndex{Cmd}{dateUSenglish}% +\BeginIndex{Cmd}{dateamerican}\BeginIndex{Cmd}{datebritish}% +\BeginIndex{Cmd}{dateUKenglish}\BeginIndex{Cmd}{dategerman}% +\BeginIndex{Cmd}{datengerman}% +\BeginIndex{Cmd}{dateaustrian}\BeginIndex{Cmd}{datenaustrian}% +\BeginIndex{Cmd}{datefrench}% +\BeginIndex{Cmd}{dateitalian}\BeginIndex{Cmd}{datespanish}% \BeginIndex{Cmd}{datedutch}\BeginIndex{Cmd}{datecroatian}% \BeginIndex{Cmd}{datefinnish}% \BeginIndex{Cmd}{datenorsk}% @@ -1661,6 +1667,7 @@ werden.% \Macro{dategerman} & 24.\,12.\,1993\\ \Macro{datengerman} & 24.\,12.\,1993\\ \Macro{dateaustrian} & 24.\,12.\,1993\\ + \Macro{datenaustrian} & 24.\,12.\,1993\\ \Macro{datefrench} & 24.\,12.\,1993\\ \Macro{dateitalian} & 24.\,12.\,1993\\ \Macro{datespanish} & 24.\,12.\,1993\\ @@ -1680,7 +1687,8 @@ werden.% \EndIndex{Cmd}{dateamerican}\EndIndex{Cmd}{datebritish}% \EndIndex{Cmd}{dateUKenglish}\EndIndex{Cmd}{dategerman}% \EndIndex{Cmd}{datengerman}% -\EndIndex{Cmd}{dateaustrian}\EndIndex{Cmd}{datefrench}% +\EndIndex{Cmd}{dateaustrian}\EndIndex{Cmd}{datenaustrian}% +\EndIndex{Cmd}{datefrench}% \EndIndex{Cmd}{dateitalian}\EndIndex{Cmd}{datespanish}% \EndIndex{Cmd}{datedutch}\EndIndex{Cmd}{datecroatian}% \EndIndex{Cmd}{datefinnish}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex index 40fd07e6027..9400c48782b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex @@ -45,7 +45,7 @@ % % ============================================================================ -\ProvidesFile{scrlttr2.tex}[2011/02/09 KOMA-Script guide (chapter: scrlttr2)] +\ProvidesFile{scrlttr2.tex}[2011/03/07 KOMA-Script guide (chapter: scrlttr2)] \chapter{Die neue Briefklasse \Class{scrlttr2}} \labelbase{scrlttr2} @@ -952,6 +952,14 @@ hier von der Bezeichnung und dem Inhalt der Variablen \autopageref{desc:scrlttr2.fontelement.pagenumber})}% \feentry{pagination}{% alternative Bezeichnung für \FontElement{pagenumber}}% + \feentry{refname}{% + Bezeichner der Felder in der Geschäftszeile (siehe + \autoref{sec:scrlttr2.firstpage}, + \autopageref{desc:scrlttr2.variable.yourref})}% + \feentry{refvalue}{% + Werte der Felder in der Geschäftszeile (siehe + \autoref{sec:scrlttr2.firstpage}, + \autopageref{desc:scrlttr2.variable.yourref})}% \feentry{specialmail}{Versandart im Anschriftfenster (siehe \autoref{sec:scrlttr2.firstpage}, \autopageref{desc:scrlttr2.variable.specialmail})}% @@ -1887,19 +1895,26 @@ Absendererg Über die Option \Option{refline} kann nun gewählt werden, ob dies auch für die Geschäftszeile\Index{Geschaeftszeile=Geschäftszeile} gelten soll. Die Geschäftszeile enthält normalerweise zumindest das Datum, kann aber auch -weitere Angaben aufnehmen. Mögliche Werte für diese Option sind -\autoref{tab:scrlttr2.refline} zu entnehmen. Voreingestellt ist -\PValue{narrow}. +weitere Angaben aufnehmen. Mögliche Werte für diese Option sind +\autoref{tab:scrlttr2.refline} zu entnehmen. Voreingestellt sind +\PValue{narrow} und \PValue{dateright}\ChangedAt{v3.09}{\Class{scrlttr2}}.% % \begin{table} \caption[{Mögliche Werte für Option \Option{refline} bei - \Class{scrlttr2}}]{Mögliche Werte für Option \Option{refline} zur Wahl - der Breite der Geschäftszeile bei \Class{scrlttr2}} + \Class{scrlttr2}}]{Mögliche Werte für Option \Option{refline} zur + Konfiguration der Geschäftszeile bei \Class{scrlttr2}} \label{tab:scrlttr2.refline} \begin{desctabular} - \pventry{narrow}{Geschäftszeile hält den Satzspiegel ein}% - \pventry{wide}{Geschäftszeile richtet sich nach Anschrift und - Absenderergänzung}% + \pventry{narrow}{Die Breite Geschäftszeile richtet sich nach dem + Satzspiegel.}% + \pventry{wide}{Die Breite der Geschäftszeile richtet sich nach Anschrift + und Absenderergänzung.}% + \pventry{dateleft}{\ChangedAt{v3.09}{\Class{scrlttr2}}% + Das Datum steht automatisch links in der Geschäftszeile.}% + \pventry{dateright}{\ChangedAt{v3.09}{\Class{scrlttr2}}% + Das Datum steht automatisch rechts in der Geschäftszeile.}% + \pventry{nodate}{\ChangedAt{v3.09}{\Class{scrlttr2}}% + Das Datum wird nicht automatisch in die Geschäftszeile gesetzt.}% \end{desctabular} \end{table} @@ -1938,6 +1953,33 @@ zur Gesch \label{tab:scrlttr2.reflineTerm} \end{table} +\BeginIndex{FontElement}{refname}% +\BeginIndex{FontElement}{refvalue}% +Schriftart und Farbe\ChangedAt{v2.97c}{\Class{scrlttr2}} der Feldbezeichnung +und des Feldinhaltes können über die beiden Elemente \FontElement{refname} und +\FontElement{refvalue} geändert werden. Dazu werden die Anweisungen +\Macro{setkomafont} und \Macro{addtokomafont} (siehe +\autoref{sec:scrlttr2.textmarkup}, +\autopageref{desc:scrlttr2.cmd.setkomafont}) verwendet. Die Voreinstellungen +der beiden Elemente sind \autoref{tab:scrlttr2.refnamerefvalue} zu +entnehmen.% +\begin{table} + \centering + \caption{Schriftvoreinstellungen für die Elemente der Geschäftszeile} + \label{tab:scrlttr2.refnamerefvalue} + \begin{tabular}{ll} + \toprule + Element & Voreinstellung \\ + \midrule + \FontElement{refname} & \Macro{sffamily}\Macro{scriptsize} \\ + \FontElement{refvalue} & \\ + \bottomrule + \end{tabular} +\end{table}% +% +\EndIndex{FontElement}{refvalue}% +\EndIndex{FontElement}{refname}% + \BeginIndex{Variable}{place}% \BeginIndex{Variable}{placeseparator}% Sind bis auf \Variable{date} alle Variablen der Geschäftszeile leer, so wird diff --git a/Master/texmf-dist/source/latex/koma-script/scrbeta.dtx b/Master/texmf-dist/source/latex/koma-script/scrbeta.dtx index 2ea2ae2c154..01b9215b5ed 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrbeta.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrbeta.dtx @@ -58,7 +58,7 @@ %%% From File: scrbeta.dtx %<*driver> % \fi -\ProvidesFile{scrbeta.dtx}[2009/07/07 v3.04 KOMA-Script (beta warning)] +\ProvidesFile{scrbeta.dtx}[2011/02/23 v3.09 KOMA-Script (beta warning)] % \iffalse \documentclass[halfparskip-]{scrdoc} \usepackage[english]{babel} @@ -156,6 +156,7 @@ % USlegal2w% % scrxfloat% % tocstyle% +% scrfontsizes% %<10pt> scrsize10pt.clo% %<11pt> scrsize11pt.clo% %<12pt> scrsize12pt.clo% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx b/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx index 46acc7cee24..b1eaf8657cf 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx @@ -58,7 +58,7 @@ %%% From File: scrkbase.dtx %<*driver> % \fi -\ProvidesFile{scrkbase.dtx}[2010/12/14 v3.08 KOMA-Script (basics)] +\ProvidesFile{scrkbase.dtx}[2011/03/31 v3.08b KOMA-Script (basics)] % \iffalse % %\ProvidesPackage{% @@ -1504,6 +1504,7 @@ % \changes{v3.00}{2008/04/30}{Neue Anweisung} % \begin{macro}{\Family@Numerical@Key} % \changes{v3.00}{2008/05/28}{Neu (intern)} +% \changes{v3.08b}{2011/03/31}{fehlendes Argument bei \cs{ifundefined}} % Ein ähnliches Makro definiert einen Schlüssel, der ein nummerisches Makro % auf einen bestimmten Wert setzt. Dabei können auch verschiedene symbolische % Werte auf denselben nummerischen Wert abgebildet werden. Das erste, @@ -1526,7 +1527,7 @@ } \newcommand*{\Family@Numerical@Key}{} \def\Family@Numerical@Key#1#2#3[#4]#5#6{% - \@ifundefined{#5}{\@namedef{#5}{0}}% + \@ifundefined{#5}{\@namedef{#5}{0}}{}% \ifx\relax#4\relax \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetNumerical{#2}{#3}{#5}{#6}{##1}}% \else @@ -1611,6 +1612,8 @@ % % \begin{macro}{\FamilyStringKey} % \changes{v3.08}{2010/11/05}{Neue Anweisung} +% \changes{v3.08b}{2011/03/31}{\cs{Family@String@Key} und +% \cs{Family@@String@@Key} vertauscht} % \begin{macro}{\Family@String@Key} % \changes{v3.08}{2010/11/05}{Neu (intern)} % \begin{macro}{\Family@@String@@Key} @@ -1628,10 +1631,10 @@ %<*base> \newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{% \@ifnextchar [%] - {\Family@String@Key{#1}{#2}{#3}}{\Family@@String@@Key{#1}{#2}{#3}}% + {\Family@@String@@Key{#1}{#2}{#3}}{\Family@String@Key{#1}{#2}{#3}}% } \newcommand*{\Family@@String@@Key}{} -\long\def\Family@@Numerical@@Key#1#2#3[#4]#5{% +\long\def\Family@@String@@Key#1#2#3[#4]#5{% \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\def#5{##1}}% } \newcommand{\Family@String@Key}[4]{% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx b/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx index 23619edc06c..f15a7576024 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx @@ -1,4 +1,4 @@ -% \CheckSum{97} +% \CheckSum{99} % \iffalse meta-comment % ====================================================================== % scrkcomp.dtx @@ -248,6 +248,10 @@ % \changes{v3.08}{2010/10/28}{Neues Macro} % \begin{macro}{\scr@v@3.08a} % \changes{v3.08a}{2011/01/25}{Neues Macro} +% \begin{macro}{\scr@v@3.08b} +% \changes{v3.08b}{2011/02/22}{Neues Macro} +% \begin{macro}{\scr@v@3.09} +% \changes{v3.09}{2011/04/02}{Neues Macro} % \begin{macro}{\scr@v@last} % \changes{v2.9u}{2005/03/05}{Neues Macro} % Nun die unterschiedlichen möglichen Werte (|\scr@v@last| ist jeweils die @@ -291,6 +295,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} % \end{macrocode} % \end{macro} @@ -319,6 +325,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % \end{macro} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkfloa.dtx b/Master/texmf-dist/source/latex/koma-script/scrkfloa.dtx index 97af4ed378e..7efd024ca86 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkfloa.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkfloa.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1146} +% \CheckSum{1187} % \iffalse meta-comment % ====================================================================== % scrkfloa.dtx @@ -58,7 +58,7 @@ %%% From File: scrkfloa.dtx %<*driver> % \fi -\ProvidesFile{scrkfloa.dtx}[2010/11/04 v3.07a KOMA-Script (floats)] +\ProvidesFile{scrkfloa.dtx}[2011/04/02 v3.09 KOMA-Script (floats)] % \iffalse \documentclass[halfparskip-]{scrdoc} \usepackage[english,ngerman]{babel} @@ -113,6 +113,18 @@ % Einige Anweisungen und Einstellungen werden bereits benötigt, bevor die % Optionen abgearbeitet werden. % +% \begin{macro}{\if@captionabove} +% \changes{v2.8h}{2001/07/19}{neu} +% \changes{v3.09}{2011/03/23}{Initialisierung vor den Optionen} +% Ob es sich bei \cs{caption} um eine Unter- oder Überschrift handelt und also +% \cs{abovecaptionskip} davor und \cs{belowcaptionskip} danach steht +% oder umgekehrt, wird über diesen Schalter gesteuert. Voreingestellt +% sind Unterschriften. +% \begin{macrocode} +\newif\if@captionabove\@captionabovefalse +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\if@tablecaptionabove} % \changes{v2.8h}{2001/07/19}{neu Option} % \changes{v2.8k}{2001/08/15}{aus \texttt{typearea} in die Klassen @@ -129,6 +141,21 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\if@figurecaptionabove} +% \changes{v3.09}{2011/03/23}{neu Option} +% \begin{macro}{\@figurecaptionabovetrue} +% \changes{v3.09}{2011/03/23}{neu (intern)} +% \begin{macro}{\@figurecaptionabovefalse} +% \changes{v3.09}{2011/03/23}{neu (intern)} +% Die Einstellung, ob es Abbildungsüber- oder -unterschriften sind, wird in +% einem Schalter gespeichert. +% \begin{macrocode} +\newif\if@figurecaptionabove\@figurecaptionabovefalse +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % \begin{macro}{\ifonelinecaptions} % \changes{v2.8q}{2001/11/17}{neuer Schalter} % \changes{v2.98c}{2008/03/03}{Definition erfolgt etwas früher} @@ -175,6 +202,8 @@ % % \begin{option}{captions} % \changes{v2.98c}{2008/02/18}{Neuer Zentralschalter für caption} +% \changes{v3.09}{2011/04/02}{Neue Werte (\texttt{heading}, +% \texttt{signature}, \texttt{figureheading}, \texttt{figuresignature})} % Dies ist nun die zentrale Option für Einstellungen zu \cs{caption}. Als % besondere Schwierigkeit ergibt sich dabei jedoch, dass das Paket % \textsf{caption} einige Sonderbehandlungen für \KOMAScript{} enthält, die @@ -187,25 +216,41 @@ % \begin{macrocode} \KOMA@key{captions}{% \KOMA@set@ncmdkey{captions}{@tempa}{% - {tableheading}{0},% - {tableabove}{0},{abovetable}{0},{abovetabular}{0},{topattable}{0},% - {tablesignature}{1},% - {tablebelow}{1},{belowtable}{1},{belowtabular}{1},{bottomattable}{1},% - {oneline}{2},% - {nooneline}{3},% - {rightbeside}{4},{besideright}{4},% - {leftbeside}{5},{besideleft}{5},% - {innerbeside}{6},{besideinner}{6},% - {outerbeside}{7},{besideouter}{7},% - {topbeside}{8},{besidetop}{8},% - {centeredbeside}{9},{besidecentered}{9},% - {middlebeside}{9},{besidemiddle}{9},% - {bottombeside}{10},{besidebottom}{10}% + {heading}{0},{above}{0},{top}{0},% + {signature}{1},{below}{1},{bot}{1},{bottom}{1},% + {tableheading}{2},% + {tableabove}{2},{abovetable}{2},{abovetabular}{2},{topattable}{2},% + {tablesignature}{3},% + {tablebelow}{3},{belowtable}{3},{belowtabular}{3},{bottomattable}{3},% + {figureheading}{4},{figureabove}{4},{abovefigure}{4},{topatfigure}{4},% + {figuresignature}{5},{figurebelow}{5},{belowfigure}{5},{bottomatfigure}{5},% + {oneline}{6},% + {nooneline}{7},% + {rightbeside}{8},{besideright}{8},% + {leftbeside}{9},{besideleft}{9},% + {innerbeside}{10},{besideinner}{10},% + {outerbeside}{11},{besideouter}{11},% + {topbeside}{12},{besidetop}{12},% + {centeredbeside}{13},{besidecentered}{13},% + {middlebeside}{13},{besidemiddle}{13},% + {bottombeside}{14},{besidebottom}{14}% }{#1}% \ifcase \@tempa\relax \@tablecaptionabovetrue + \@figurecaptionabovetrue + \@captionabovetrue + \or + \@tablecaptionabovefalse + \@figurecaptionabovefalse + \@captionabovefalse + \or + \@tablecaptionabovetrue \or \@tablecaptionabovefalse + \or + \@figurecaptionabovetrue + \or + \@figurecaptionabovefalse \or \onelinecaptionstrue \or @@ -353,16 +398,6 @@ \newcommand*{\captionformat}{:\ } % \end{macrocode} % \end{macro} -% \begin{macro}{\if@captionabove} -% \changes{v2.8h}{2001/07/19}{neu} -% Ob es sich um eine Unter- oder Überschrift handelt und also -% \cs{abovecaptionskip} davor und \cs{belowcaptionskip} danach steht -% oder umgekehrt, wird über diesen Schalter gesteuert. Voreingestellt -% sind Unterschriften. -% \begin{macrocode} -\newif\if@captionabove\@captionabovefalse -% \end{macrocode} -% \end{macro} % \begin{macro}{\scr@caption} % \changes{v2.8h}{2001/07/19}{neu (intern)} % \begin{macro}{\captionabove} @@ -1282,6 +1317,11 @@ % % \begin{macro}{captionof} % \changes{v3.05}{2009/07/08}{Neue Anweisung} +% \changes{v3.09}{2011/03/21}{Verwendung des internen \cs{scr@caption}} +% \begin{macro}{captionaboveof} +% \changes{v3.09}{2011/03/21}{Neue Anweisung} +% \begin{macro}{captionbelowof} +% \changes{v3.09}{2011/03/21}{Neue Anweisung} % Obwohl es inzwischen mehrere Pakete gibt, die diese Anweisung bereit % stellen, kommt es doch immer wieder zu Fehlern, weil einige Anwender diese % Pakete nicht nutzen. Also habe ich beschlossen, das selbst zu @@ -1290,10 +1330,14 @@ % Paket \textsf{caption} gibt es solche Probleme nicht, das dieses % \cs{captionof} ohnehin per \cs{def} definiert. % \begin{macrocode} -\newcommand*{\captionof}[1]{\def\@captype{#1}\caption} +\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption} +\newcommand*{\captionaboveof}{\@captionabovetrue\captionof} +\newcommand*{\captionbelowof}{\@captionabovefalse\captionof} \BeforePackage{capt-of}{\let\captionof\relax} % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{Standardbezeichner} @@ -1377,11 +1421,15 @@ % zweispaltigem Satz siehe \texttt{classes.dtx} und \texttt{source2e}. % \begin{macrocode} \newenvironment{figure}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@float{figure}% }{% \end@float } \newenvironment{figure*}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@dblfloat{figure}% }{% \end@dblfloat diff --git a/Master/texmf-dist/source/latex/koma-script/scrkfont.dtx b/Master/texmf-dist/source/latex/koma-script/scrkfont.dtx index 6cb3ee15055..33a90b2bc48 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkfont.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkfont.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1835} +% \CheckSum{2688} % \iffalse meta-comment % ====================================================================== % scrkfont.dtx @@ -58,8 +58,14 @@ %%% From File: scrkfont.dtx %<*driver> % \fi -\ProvidesFile{scrkfont.dtx}[2010/10/24 v3.05a KOMA-Script (font selection)] +\ProvidesFile{scrkfont.dtx}[2011/02/23 v3.09 KOMA-Script (font selection)] +% \changes{v3.09}{2011/02/23}{Neues Paket \texttt{scrfontsizes}} % \iffalse +% +%\ProvidesPackage{scrfontsizes}[% +% \KOMAScriptVersion\space package +% (font size file generator)] +%<*driver> \documentclass[halfparskip-]{scrdoc} \usepackage[english,ngerman]{babel} \usepackage[latin1]{inputenc} @@ -97,6 +103,23 @@ %<*option> % \fi % +% \subsection{Der Generator für Schriftgrößendateien} +% +% \iffalse +%<*generator> +% \fi +% Ab Version 3.09 gibt es einen Generator für neue +% Schriftgrößendateien. Dieser richtet sich vor allem an Klassenautoren und +% bietet die Möglichkeit, eine eigene berechnete Schriftgrößendatei als +% Grundlage für eine spezifisch angepasste Schriftgrößendateie zu erstellen. +% Optionen besitzt dieser jedoch nicht. Daher reduziert sich der Optionenteil +% auf ein einfaches +% \begin{macrocode} +\ProcessOptions\relax +% \end{macrocode} +% \iffalse +% +% \fi % % \subsection{Option zur Auswahl der Größe der Grundschrift} % @@ -231,18 +254,33 @@ %<*body> % \fi % +% \subsection{Sicherstellen der Umgebung des Generators} +% +% \iffalse +%<*generator> +% \fi +% Der Generator benötigt die Anweisung \cs{changefontsizes}, die entweder von +% einer \KOMAScript-Klasse oder vom Paket \texttt{scrextend} bereitgestellt +% wird: +% \begin{macrocode} +\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} +% \end{macrocode} +% \iffalse +% +% \fi +% % \subsection{Einlesen der Schriftgrößendatei} % % \changes{v2.6}{2000/01/04}{Einlesen der Schriftgrößen-Options-Datei % funktioniert nun mit diversen Größen} -% \changes{v2.98c}{2008/03/26}{Eigener \texttt{scrsize}-Datei definiert} +% \changes{v2.98c}{2008/03/26}{Eigene \texttt{scrsize}-Dateien definiert} % % \iffalse % %<*10pt|11pt|12pt> % \fi % -% Trotzdem werden min. drei Schriftgrößendateien benötigt. Ab Version 2.98c +% Es werden min. drei Schriftgrößendateien benötigt. Ab Version 2.98c % verwendet \KOMAScript{} vorzugsweise eigene Dateien, die auch noch zu einem % späteren Zeitpunkt geladen werden können. Ansonsten sind diese Dateien % weitestgehend dem Quellcode der Standardklassen \texttt{classes.dtx} @@ -555,6 +593,8 @@ % % \begin{macro}{\changefontsizes} % \changes{v2.96}{2006/08/11}{neue Anweisung (benötigt \eTeX)} +% \changes{v3.08b}{2011/02/22}{drei falsche \cs{def} durch \cs{edef} +% ersetzt} % Diese Anweisung bietet berechnete Schriftgrößen als Fallbacklösung an. Das % optionale erste Argument ist dabei der Grundlinienabstand. Das zweite % Argument ist die gewünschte Grundschriftgröße. @@ -778,7 +818,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listiv\endcsname \endgroup - \def\@listiv{\leftmargin\leftmarginiv + \edef\@listiv{\leftmargin\leftmarginiv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -787,7 +827,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listv\endcsname \endgroup - \def\@listv{\leftmargin\leftmarginv + \edef\@listv{\leftmargin\leftmarginv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -796,7 +836,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listvi\endcsname \endgroup - \def\@listvi{\leftmargin\leftmarginvi + \edef\@listvi{\leftmargin\leftmarginvi \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -816,6 +856,356 @@ } % \end{macrocode} % \end{macro} +% \iffalse +% +%<*generator> +% \fi +% \begin{macro}{\generatefontfile} +% \changes{v3.09}{2011/02/23}{Neu} +% Dies ist die zentrale Anweisung des neuen Generators. Es wird eine neue +% Schriftgrößendatei ausgegeben. Der Name dieser Datei setzt sich aus dem +% ersten obligaorischen Argument gefolgt von der Schriftgröße und der +% Erweiterung \texttt{.clo} zusammen. Da Schriftgrößendateien, die mit +% »\texttt{scrsize}« beginnen, \KOMAScript{} vorbehalten sind wird dieses +% erste Argument verweigert. +% \begin{macrocode} +\newcommand*{\generatefontfile}[1]{% + \ifstr{#1}{scrsize}{% + \ClassError{\KOMAClassName}{% + Font file name `scrsize' not allowed% + }{% + Font files with name `scrsize.clo' are reserved for + KOMA-Script.\MessageBreak + You should use another prefix and rename \string\@fontsizefilebase\space + either before\MessageBreak + loading a KOMA-Script class using one of \string\documentclass, + \string\LoadClass,\MessageBreak + or \string\LoadClassWithOptions\space or before loading package + `scrextend' using another\MessageBreak + class.}% + \@@@generatefontfile + }{% +% \end{macrocode} +% Das zweite Argument ist optional. Ist es angegeben, so gibt es den +% gewünschten Zeilenabstand an. Ist es nicht angegeben, so wird der +% Zeilenabstand |\changefontsized| überlassen. Das dritte Argument ist +% schließlich die gewünschte Schriftgröße. +% \begin{macrocode} + \@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}% + }% +} +% \end{macrocode} +% \begin{macro}{\@generatefontfile} +% \changes{v3.09}{2011/02/23}{Neu (intern)} +% \begin{macro}{\@@generatefontfile} +% \changes{v3.09}{2011/02/23}{Neu (intern)} +% Diese beiden Hilfsmakros werden benötigt, um Aufrufe von |\generatefontfile| +% mit oder ohne optionales, zweites Argument zu behandeln. In jedem Fall wird +% die gewünschte Schriftgröße innerhalb einer Gruppe mit Hilfe von +% |\changefontsizes| bestimmt und dann eine Datei mit den dabei ermittelten +% Einstellungen ausgegeben. +% \begin{macrocode} +\newcommand*{\@generatefontfile}{} +\def\@generatefontfile#1[#2]#3{% + \begingroup + \@ifundefined{setparsizes}{\setlength{\parskip}{0pt}}% + {\setparsizes{0pt}{0pt}{0pt}}% + \changefontsizes[{#2}]{#3}% + \generate@fontfile{#1}{#3}% + \endgroup +} +\newcommand\@@generatefontfile[2]{% + \begingroup + \@ifundefined{setparsizes}{\setlength{\parskip}{0pt}}% + {\setparsizes{0pt}{0pt}{0pt}}% + \changefontsizes{#2}% + \generate@fontfile{#1}{#2}% + \endgroup +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\@@@generatorfontfile} +% \changes{v3.09}{2011/02/23}{Neu (intern)} +% Dieses Hilfsmakro wird hingegen im Fehlerfall aufgerufen, um die Ausgabe +% einer Schriftgrößendatei zu verhindern. +% \begin{macrocode} +\newcommand*{\@@@generatefontfile}[2][]{} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@fontfile} +% \changes{v3.09}{2011/02/23}{Neu (intern)} +% Da später die Verwendung von |\generatefontfile| noch auf die Präambel +% beschränkt werden wird, ist es kein Problem hier |\@mainaux| für die Ausgabe +% zu missbrauchen. Das funktioniert aber nur, weil |\@mainaux| erst innerhalb +% von |\begin{document}| tatsächlich geöffnet wird. Die Dateisparsamkeit an +% dieser Stelle ist also eigentlich ein ziemlich unsauberer Hack! +% \begin{macrocode} +\newcommand*{\@fontfile}{} +\let\@fontfile\@mainaux +% \end{macrocode} +% \begin{macro}{\generate@fontfile} +% \changes{v3.09}{2011/02/23}{Neu (intern)} +% Es wird nun eine Schriftgrößendatei ausgegeben. Dabei werden die aktuellen +% Einstellungen verwendet. Dabei wird die Tatsache ausgenutzt, dass diese +% Anweisung immer innerhalb einer Gruppe aufgerufen wird. Das erste Argument +% ist der Dateinamenpräfix (also so etwas wie »\texttt{scrsize}«, das zweite +% Argument die gewünschte Schriftgröße. Es ist zu beachten, dass alle Werte in +% der Datei in pt angegeben werden, auch wenn die gewünschte Schriftgröße eine +% ganz andere Einheit besitzt. Das macht schlicht die Arbeit etwas einfacher. +% \begin{macrocode} +\newcommand*{\generate@fontfile}[2]{% + \def\@ind{\space\space}% + \immediate\openout\@fontfile #1#2.clo + \immediate\write\@fontfile{\@percentchar^^J% + \@percentchar\space This is file `#1#2.clo', generated with^^J% + \@percentchar\space scrfontsizes + \csname ver@scrfontsizes.sty\endcsname,^^J% + \@percentchar\space Copyright (c) Markus Kohm.^^J% + \@percentchar^^J% + \string\ProvidesFile{#1#2.clo}[% + \the\year/\ifnum\month<10 0\fi\the\month/\ifnum\day<10 0\fi\the\day% + \space generated font size class option (#2)]}% + \immediate\write\@fontfile{% + \string\def\string\normalsize{\@percentchar^^J% + \@ind\string\@setfontsize\string\normalsize{\f@size}{\f@baselineskip}% + \@percentchar^^J% + \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J% + \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J% + \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J% + \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J% + \@ind\string\let\string\@listi\string\@listI^^J% + }\@percentchar% + }% + \begingroup\small\@listi + \immediate\write\@fontfile{% + \string\def\string\small{\@percentchar^^J% + \@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}% + \@percentchar^^J% + \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J% + \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J% + \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J% + \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J% + \@ind\string\def\string\@listi{\@percentchar^^J% + \@ind\@ind\string\leftmargin\string\leftmargini^^J% + \@ind\@ind\string\topsep \the\topsep^^J% + \@ind\@ind\string\parsep \the\parsep^^J% + \@ind\@ind\string\itemsep \string\parsep^^J% + \@ind}\@percentchar^^J% + }\@percentchar% + }% + \endgroup + \begingroup\footnotesize\@listi + \immediate\write\@fontfile{% + \string\def\string\footnotesize{\@percentchar^^J% + \@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}% + \@percentchar^^J% + \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J% + \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J% + \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J% + \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J% + \@ind\string\def\string\@listi{\@percentchar^^J% + \@ind\@ind\string\leftmargin\string\leftmargini^^J% + \@ind\@ind\string\topsep \the\topsep^^J% + \@ind\@ind\string\parsep \the\parsep^^J% + \@ind\@ind\string\itemsep \string\parsep^^J% + \@ind}\@percentchar^^J% + }\@percentchar% + }% + \endgroup + \begingroup\scriptsize + \immediate\write\@fontfile{% + \string\def\string\scriptsize{% + \string\@setfontsize\string\scriptsize{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\tiny + \immediate\write\@fontfile{% + \string\def\string\tiny{% + \string\@setfontsize\string\tiny{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\large + \immediate\write\@fontfile{% + \string\def\string\large{% + \string\@setfontsize\string\large{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\Large + \immediate\write\@fontfile{% + \string\def\string\Large{% + \string\@setfontsize\string\Large{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\LARGE + \immediate\write\@fontfile{% + \string\def\string\LARGE{% + \string\@setfontsize\string\LARGE{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\huge + \immediate\write\@fontfile{% + \string\def\string\huge{% + \string\@setfontsize\string\huge{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\Huge + \immediate\write\@fontfile{% + \string\def\string\Huge{% + \string\@setfontsize\string\Huge{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \immediate\write\@fontfile{\string\normalsize}% + \immediate\write\@fontfile{% + \string\setlength{\string\footnotesep}{\the\footnotesep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\skip\string\footins}{\the\skip\footins}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\floatsep}{\the\floatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\textfloatsep}{\the\textfloatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\intextsep}{\the\intextsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\dblfloatsep}{\the\dblfloatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\dbltextfloatsep}{\the\dbltextfloatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@fptop}{\the\@fptop}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@fpsep}{\the\@fpsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@fpbot}{\the\@fpbot}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@dblfptop}{\the\@dblfptop}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@dblfpsep}{\the\@dblfpsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@dblfpbot}{\the\@dblfpbot}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\partopsep}{\the\partopsep}\@percentchar + }% + \begingroup + \@listi + \immediate\write\@fontfile{% + \string\def\string\@listi{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmargini^^J% + \@ind\string\topsep \the\topsep^^J% + \@ind\string\parsep \the\parsep^^J% + \@ind\string\itemsep \string\parsep^^J% + }\@percentchar + }% + \endgroup + \immediate\write\@fontfile{% + \string\let\string\@listI\string\@listi + }% + \begingroup + \@listii + \immediate\write\@fontfile{% + \string\def\string\@listii{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginii^^J% + \@ind\string\labelwidth\string\leftmarginii^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + \@ind\string\topsep \the\topsep^^J% + \@ind\string\parsep \the\parsep^^J% + \@ind\string\itemsep \string\parsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listiii + \immediate\write\@fontfile{% + \string\def\string\@listiii{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginiii^^J% + \@ind\string\labelwidth\string\leftmarginiii^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + \@ind\string\topsep \the\topsep^^J% + \@ind\string\parsep \the\parsep^^J% + \@ind\string\partopsep \the\partopsep^^J% + \@ind\string\itemsep \string\topsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listiv + \immediate\write\@fontfile{% + \string\def\string\@listiv{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginiv^^J% + \@ind\string\labelwidth\string\leftmarginiv^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listv + \immediate\write\@fontfile{% + \string\def\string\@listv{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginv^^J% + \@ind\string\labelwidth\string\leftmarginv^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listvi + \immediate\write\@fontfile{% + \string\def\string\@listvi{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginvi^^J% + \@ind\string\labelwidth\string\leftmarginvi^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + }\@percentchar + }% + \endgroup + \immediate\write\@fontfile{% + \string\@ifundefined{@list@extra}{}{\@percentchar^^J% + \@ind\string\l@addto@macro{\string\@listi}{\string\@list@extra}% + \@percentchar^^J% + \@ind\string\let\string\@listI=\string\@listi^^J% + \@ind\string\l@addto@macro{\string\@listii}{\string\@list@extra}% + \@percentchar^^J% + \@ind\string\l@addto@macro{\string\@listiii}{\string\@list@extra}% + \@percentchar^^J% + \@ind\string\l@addto@macro{\string\footnotesize}{\string\protect + \string\add@extra@listi{ftns}}\@percentchar^^J% + \@ind\string\l@addto@macro{\string\small}{\string\protect + \string\add@extra@listi{sml}}\@percentchar^^J% + }\@percentchar^^J% + \string\@listi^^J% + \string\endinput^^J% + \@percentchar^^J% + \@percentchar\space End of file `#1#2.clo'. + } + \immediate\closeout\@fontfile +} +\@onlypreamble\generatefontfile +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \iffalse +% +%<*class|extend> +% \fi % \end{macro} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrklang.dtx b/Master/texmf-dist/source/latex/koma-script/scrklang.dtx index c0c1414f0a7..08f47b271a1 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrklang.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrklang.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1189} +% \CheckSum{1243} % \iffalse meta-comment % ====================================================================== % scrklang.dtx @@ -58,7 +58,7 @@ %%% From File: scrklang.dtx %<*driver> % \fi -\ProvidesFile{scrklang.dtx}[2011/01/20 v3.08 KOMA-Script (language)] +\ProvidesFile{scrklang.dtx}[2011/03/10 v3.08 KOMA-Script (language)] % \iffalse \documentclass[halfparskip-]{scrdoc} \usepackage[english,ngerman]{babel} @@ -376,21 +376,29 @@ % \begin{macro}{\captionsUSenglish} % \begin{macro}{\dateUSenglish} % \begin{macro}{\captionsamerican} +% \changes{v2.4c}{1997/11/25}{american identisch mit USenglish definiert} % \begin{macro}{\dateamerican} % \changes{v2.4c}{1997/11/25}{american identisch mit USenglish definiert} % \begin{macro}{\captionsbritish} +% \changes{v2.4c}{1997/11/25}{british identisch mit english definiert} % \begin{macro}{\datebritish} % \changes{v2.4c}{1997/11/25}{british identisch mit english definiert} % \begin{macro}{\captionsUKenglish} +% \changes{v2.4c}{1997/11/25}{UKenglish identisch mit english definiert} % \begin{macro}{\dateUKenglish} % \changes{v2.4c}{1997/11/25}{UKenglish identisch mit english definiert} % \begin{macro}{\captionsgerman} % \begin{macro}{\dategerman} % \begin{macro}{\captionsngerman} +% \changes{v2.5}{1999/09/08}{ngerman neu und identisch mit german} % \begin{macro}{\datengerman} % \changes{v2.5}{1999/09/08}{ngerman neu und identisch mit german} % \begin{macro}{\captionsaustrian} % \begin{macro}{\dateaustrian} +% \begin{macro}{\captionsnaustrian} +% \changes{v3.09}{2011/03/10}{naustrian neu und identisch mit austrian} +% \begin{macro}{\datenaustrian} +% \changes{v3.09}{2011/03/10}{naustrian neu und identisch mit austrian} % \begin{macro}{\captionsfrench} % \begin{macro}{\datefrench} % \begin{macro}{\captionsitalian} @@ -401,9 +409,11 @@ % \changes{v2.4c}{1997/11/25}{Ich hoffe, dass das stimmt} % \changes{v2.4c}{1997/11/25}{Datumsumschaltung nicht mehr zwingend} % \begin{macro}{\captionscroation} +% \changes{v2.8q}{2001/05/10}{Neu} % \begin{macro}{\datecroatian} % \changes{v2.8q}{2001/05/10}{Neu} % \begin{macro}{\captionsdutch} +% \changes{v2.8q}{2002/02/01}{Neu} % \begin{macro}{\datedutch} % \changes{v2.8q}{2002/02/01}{Neu} % \begin{macro}{\captionsfinnish} @@ -610,6 +620,24 @@ \providecaptionname{austrian}\wwwname{URL}% \providecaptionname{austrian}\bankname{Bankverbindung}% \g@addnumerical@date{austrian}{\number\day.\,\number\month.\,\number\year}% + \providecaptionname{naustrian}\yourrefname{Ihr Zeichen}% + \providecaptionname{naustrian}\yourmailname{Ihr Schreiben vom}% + \providecaptionname{naustrian}\myrefname{Unser Zeichen}% + \providecaptionname{naustrian}\customername{Kundennummer}% + \providecaptionname{naustrian}\invoicename{Rechnungsnummer}% + \providecaptionname{naustrian}\subjectname{Betrifft}% + \providecaptionname{naustrian}\ccname{Kopien an}% + \providecaptionname{naustrian}\enclname{Anlagen}% + \providecaptionname{naustrian}\headtoname{An}% + \providecaptionname{naustrian}\headfromname{Von}% + \providecaptionname{naustrian}\datename{Datum}% + \providecaptionname{naustrian}\pagename{Seite}% + \providecaptionname{naustrian}\phonename{Telefon}% + \providecaptionname{naustrian}\faxname{Fax}% + \providecaptionname{naustrian}\emailname{E-Mail}% + \providecaptionname{naustrian}\wwwname{URL}% + \providecaptionname{naustrian}\bankname{Bankverbindung}% + \g@addnumerical@date{naustrian}{\number\day.\,\number\month.\,\number\year}% \providecaptionname{french}\yourrefname{Vos r\'ef\'erences}% \providecaptionname{french}\yourmailname{Votre lettre du}% \providecaptionname{french}\myrefname{Nos r\'ef\'erences}% @@ -843,6 +871,10 @@ \captionsaustrian \dateaustrian \fi\fi + \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian + \captionsnaustrian + \datenaustrian + \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german \captionsgerman \dategerman @@ -905,7 +937,7 @@ used language is `\languagename'.\MessageBreak Supported languages are `english', `UKenglish',\MessageBreak `british', `american', `USenglish',\MessageBreak - `german', `ngerman', `austrian',\MessageBreak + `german', `ngerman', `austrian', `naustrian',\MessageBreak `dutch', `italian', `spanish',\MessageBreak `croatian', `finnish', `norsk'% }% @@ -945,6 +977,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % \iffalse % diff --git a/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx b/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx index eafcc61ce0d..808116dceff 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx @@ -1,4 +1,4 @@ -% \CheckSum{2970} +% \CheckSum{2990} % \iffalse meta-comment % ====================================================================== % scrknpap.dtx @@ -601,26 +601,48 @@ % entspricht. Voreingestellt ist die Textbreite. % \begin{macro}{\if@refwide} % \changes{v2.8n}{2001/09/08}{Neuer Schalter} +% \changes{v3.09}{2011/03/07}{Neue Werte: \texttt{dateleft}, +% \texttt{dateright}, \texttt{nodate}} % \begin{macro}{\@refwidetrue} % \begin{macro}{\@refwidefalse} % Gespeichert wird die Information in einem Schalter. +% \begin{macro}{\@datepos} +% \changes{v3.09}{2011/03/07}{Neu (intern)} +% Das Datum kann links oder rechts oder gar nicht gesetzt werden. +% Wo die Speicherung erfolgt wird in einem nummerischen Makro +% abglegt. Voreingestellt ist rechts. % \begin{macrocode} \newif\if@refwide +\newcommand*{\@datepos}{1} \KOMA@key{refline}[wide]{% \begingroup - \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1}}{#1}% + \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1},% + {dateleft}{2},{leftdate}{2},% + {dateright}{3},{rightdate}{3},% + {nodate}{4}% + }{#1}% \ifcase\@tempa \endgroup \@refwidetrue - \else + \or \endgroup \@refwidefalse + \or + \endgroup + \def\@datepos{2}% + \or + \endgroup + \def\@datepos{1}% + \or + \endgroup + \def\@datepos{0}% \fi } % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % \end{option} % % @@ -2482,6 +2504,14 @@ % \changes{v2.97c}{2007/05/14}{Neue Fontelemente} % Je nachdem, welche Felder definiert sind, muss eine geschäftsmäßiger % Standardbrief oder ein eher persönliches Aussehen gewählt werden. +% \begin{macro}{\do@set@reffield} +% \changes{v3.09}{2011/03/06}{Neu (intern)} +% Das ist ein \cs{do} für die Felder und bekommt innerhalb von +% \cs{@datefield} unterschiedliche Bedeutungen. An dieser Stelle wird es daher +% nur reserviert. +% \begin{macrocode} +\newcommand*{\do@set@reffield}{} +% \end{macrocode} % \begin{macro}{\@set@reffield} % Einzelne Felder werden mit Hilfe dieses Makros gesetzt. Als Parameter wird % der Name des Feldes übergeben. Es wird dann davon ausgegangen, dass der @@ -2502,6 +2532,20 @@ } % \end{macrocode} % \end{macro} +% \begin{macro}{\@test@reffield} +% \changes{v3.09}{2011/03/06}{Neu (intern)} +% Dieses Makro testet, ob ein Feld tatsächlich zu setzen ist und setzt +% ggf. \cs{@tempswa}. +% \begin{macrocode} +\newcommand*{\@test@reffield}[1]{% + \ifkomavarempty{#1}{}{% +% \if@tempswa\l@addto@macro\@tempa{, }\fi +% \l@addto@macro\@tempa{#1}% + \@tempswatrue + }% +} +% \end{macrocode} +% \end{macro} % \begin{macro}{\@set@reffields} % \changes{v2.8q}{2002/01/14}{Neu} % Dieses Makro enthält alle Aufrufe von \cs{@set@reffield}, die durchzuführen @@ -2511,11 +2555,13 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\addtoreffields} +% \changes{v3.09}{2011/03/06}{Verwendung von \cs{do@set@reffield} an Stelle +% von \cs{@set@reffield}} % Dieses Makro erwartet als obligatorisches Argument den Namen einer % KOMA-Script Variable. Der Befehl arbeitet lokal zur aktuellen Umgebung. % \begin{macrocode} \newcommand*{\addtoreffields}[1]{% - \l@addto@macro{\@set@reffields}{\@set@reffield{#1}}% + \l@addto@macro{\@set@reffields}{\do@set@reffield{#1}}% } % \end{macrocode} % \end{macro} @@ -2562,6 +2608,8 @@ % \changes{v2.9l}{2003/01/28}{Berechnung von \texttt{refhpos} hinzugefügt} % \changes{v2.95}{2006/03/23}{Absatzeinzug mit \cs{setparsizes} abschalten} % \changes{v2.97c}{2007/05/14}{Neue Font-Elemente} +% \changes{v3.09}{2011/03/06}{\cs{do@set@reffield} muss initialisiert +% werden} % \begin{macrocode} \newcommand*{\@datefield}{{% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative @@ -2579,7 +2627,8 @@ \@setplength{refhpos}{\oddsidemargin}% \@addtoplength{refhpos}{1in}% \fi - \else\ifdim\useplength{refhpos}=\z@ + \else + \ifdim\useplength{refhpos}=\z@ \begingroup % \end{macrocode} % Wir bestimmen zunächst, um wieviel die Geschäftszeile schmaler ist als der @@ -2616,64 +2665,68 @@ \@tempswafalse \move@topt\vskip\useplength{refvpos}% % \end{macrocode} +% Jetzt kontrollieren wir, ob überhaupt etwas auszugeben ist: +% \begin{macrocode} + \@tempswafalse + \let\do@set@reffield\@test@reffield +% \let\@tempa\@empty + \@set@reffields + \ifcase \@datepos\else\@test@reffield{date}\fi + \if@tempswa +% \typeout{Reference line(s) with: \@tempa}% + \@tempswafalse +% \end{macrocode} % Jetzt erfolgt noch die Absatzeinzugkorrektur. Danach kommt die eigentliche % Arbeit. % \begin{macrocode} - \rlap{\noindent\move@topl\hskip\useplength{refhpos}% - \vbox{\hsize\useplength{refwidth}% - \noindent\@set@reffields% + \rlap{\noindent\move@topl\hskip\useplength{refhpos}% + \vbox{\hsize\useplength{refwidth}% + \noindent + \ifnum \@datepos=2 + \@set@reffields + \if@tempswa + \@tempswafalse + \@set@reffield{date}% + \fi + \fi + \let\do@set@reffield\@set@reffield + \@set@reffields% + \if@tempswa + \ifnum \@datepos=1 \@set@reffield{date}\fi% % \end{macrocode} % Seit Version~2.97c wird hier auch noch getestet, ob die Geschäftszeile % möglicherweise mit zu großer Schrift gesetzt wird. % \begin{macrocode} - \if@tempswa - \setbox0\hbox{\usekomafont{refname}\strutbox}% - \ifdim\ht0>\ht\strutbox - \ClassWarningNoLine{scrlttr}{% - Font element `refname' should not be larger than - \string\normalsize!}% - \fi - \setbox0\hbox{\usekomafont{refvalue}\strutbox}% - \ifdim\ht0>\ht\strutbox - \ClassWarningNoLine{scrlttr}{% - Font element `refvalue' should not be larger than - \string\normalsize!}% - \fi - \fi - \ifkomavarempty{date}{% - \if@tempswa - \typeout{Reference line(s): with fields but without date}% - \else - \typeout{Reference line(s): no}% - \aftergroup\aftergroup\aftergroup\@tempswatrue - \fi - }{% - \if@tempswa - \typeout{Reference line(s): with fields and date}% - \settowidth{\@tempdima}{\strut - \usekomafont{refvalue}\usekomavar{date}}% - \setbox0\hbox{\usekomafont{refname}\usekomavar*{date}}% - \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi - \enskip\hfill - \parbox[t]{\@tempdima}{\noindent\raggedright% - \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{date}}% + \setbox0\hbox{\usekomafont{refname}\strutbox}% + \ifdim\ht0>\ht\strutbox + \ClassWarningNoLine{scrlttr}{% + Font element `refname' should not be larger than + \string\normalsize!}% + \fi + \setbox0\hbox{\usekomafont{refvalue}\strutbox}% + \ifdim\ht0>\ht\strutbox + \ClassWarningNoLine{scrlttr}{% + Font element `refvalue' should not be larger than + \string\normalsize!}% + \fi \else - \typeout{Reference line: only place and date}% - \enskip\hfill - \ifkomavarempty{place}{}{% - \usekomavar{place}\usekomavar{placeseparator}}% - \usekomavar{date}% - \@tempswatrue + \ifcase \@datepos\else + \ifnum \@datepos=1 \enskip\hfill\fi + \ifkomavarempty{place}{}{% + \usekomavar{place}\usekomavar{placeseparator}}% + \usekomavar{date}% + \fi \fi - }% }% }% - \if@tempswa\vskip-\baselineskip\fi +% \else\typeout{No reference line.}% + \fi \vskip\useplength{refaftervskip}% }% } % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\@maketitle} % \changes{v2.3b}{1996/01/14}{Verwendung von \cs{sectfont} für den diff --git a/Master/texmf-dist/source/latex/koma-script/scrkplen.dtx b/Master/texmf-dist/source/latex/koma-script/scrkplen.dtx index 78ce95c0657..03def011315 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkplen.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkplen.dtx @@ -58,7 +58,7 @@ %%% From File: scrkplen.dtx %<*driver> % \fi -\ProvidesFile{scrkplen.dtx}[2007/09/17 v2.97c KOMA-Script (pseudo length)] +\ProvidesFile{scrkplen.dtx}[2011/03/20 v3.08b KOMA-Script (pseudo length)] % \iffalse \documentclass{scrdoc} \usepackage[english,ngerman]{babel} @@ -128,7 +128,7 @@ \newcommand*{\@newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% - }{% + }{% \ClassError{scrlttr2}{% pseudo-length \expandafter\string\csname ltr@len@#1\endcsname already defined% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkvars.dtx b/Master/texmf-dist/source/latex/koma-script/scrkvars.dtx index e2475d619ea..a897de9844c 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkvars.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkvars.dtx @@ -58,7 +58,7 @@ %%% From File: scrkvars.dtx %<*driver> % \fi -\ProvidesFile{scrkvars.dtx}[2010/10/28 v3.08 KOMA-Script (koma variables)] +\ProvidesFile{scrkvars.dtx}[2011/03/31 v3.08b KOMA-Script (koma variables)] % \iffalse \documentclass{scrdoc} \usepackage[english,ngerman]{babel} @@ -276,17 +276,17 @@ \newcommand*{\@usekomavar}[2][\@firstofone]{% \@ifundefined{scr@#2@var}{% \@komavar@err{use}{#2}% - }{% + }{% #1{\@nameuse{scr@#2@var}}% - }% - } + }% +} \newcommand*{\@usekomaname}[2][\@firstofone]{% \@ifundefined{scr@#2@var}{% \@komavar@err{use}{#2}% - }{% + }{% #1{\@nameuse{scr@#2@name}}% - }% - } + }% +} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx b/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx index c888d83bbba..ea0ced8821e 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx @@ -112,7 +112,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx index 63dfbd63ba2..a5a742de4c2 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx @@ -1,4 +1,4 @@ -% \CheckSum{514} +% \CheckSum{593} % \iffalse meta-comment % ====================================================================== % scrlfile.dtx @@ -64,7 +64,7 @@ %%% From File: scrlfile.dtx %<*driver|scrlfile|load> % \fi -\def\scrlfileversion{2011/02/11 v3.08a} +\def\scrlfileversion{2011/03/09 v3.09} % \iffalse % %<*driver> @@ -246,8 +246,12 @@ % % \DescribeMacro{\AfterClass} % \DescribeMacro{\AfterClass*} +% \DescribeMacro{\AfterClass+} +% \DescribeMacro{\AfterClass!} % \DescribeMacro{\AfterPackage} % \DescribeMacro{\AfterPackage*} +% \DescribeMacro{\AfterPackage+} +% \DescribeMacro{\AfterPackage!} % The command \cs{AfterClass}\marg{class}\marg{instructions} and the % command \cs{AfterPackage}\marg{package}\marg{instructions} work the % same way like command \cs{AfterFile}. The only difference is that @@ -257,7 +261,24 @@ % have to be omitted. The starred versions execute the % \meta{instructions} not only next time the class or package is % loaded, but also immediately if the class or package has been loaded -% already. +% already. The plus versions differ from the starred versions by execution +% first if loading of class of package has been finished. The difference is +% only valid if A loads B and B uses one of the after commands for A. In all +% cases the \meta{instructions} will be executed before \cs{AtEndOfClass} or +% \cs{AtEndOfPackage} calls of the class or package if loading of the class or +% package was finished not yet. To even execute the \marg{instructions} after +% those, use the exclamation mark version. +% +% \DescribeMacro{\AfterAtEndOfClass} +% \DescribeMacro{\AfterAtEndOfPackage} +% The command \cs{AfterAtEndOfClass}\marg{class}\marg{instructions} and the +% command \cs{AfterAtEndOfPackage}\marg{package}\marg{instructions} work like +% \cs{AfterClass} and \cs{AfterPackage} but execute the \meta{instructions} +% after \cs{AtEndOfClass} or \cs{AtEndOfPackage} instructions outside the +% context of the class or package. There are no star, plus or exclamation mark +% versions of these commands. Just use \cs{AfterClass!} or \cs{AfterPackage!} +% if you want to execute the \meta{instructions} if the class or package has +% been loaded already. % % \DescribeMacro{\ReplaceInput} % The command \cs{ReplaceInput}\marg{name of file to be replaced}\marg{name of @@ -549,6 +570,7 @@ \noexpand\@onefilewithoptions{\csname #1.#4-@aliasname\endcsname}}% \fi \scr@@onefilewithoptions[{#2}][{#3}]{#4}% + \scr@load@hook{lateafter}{#1.#4}% } % \end{macrocode} % \end{macro} @@ -632,11 +654,21 @@ % \begin{macro}{\AfterFile} % \begin{macro}{\BeforeClass} % \begin{macro}{\AfterClass} +% \begin{macro}{\AfterAtEndOfClass} % \begin{macro}{\@AfterClass} +% \begin{macro}{\@@AfterClass} +% \changes{v3.09}{2011/03/08}{new (internal)} +% \begin{macro}{\@@@AfterClass} +% \changes{v3.09}{2011/03/09}{new (internal)} % \begin{macro}{\@sAfterClass} % \begin{macro}{\BeforePackage} % \begin{macro}{\AfterPackage} +% \begin{macro}{\AfterAtEndOfPackage} % \begin{macro}{\@AfterPackage} +% \begin{macro}{\@@AfterPackage} +% \changes{v3.09}{2011/03/08}{new (internal)} +% \begin{macro}{\@@@AfterPackage} +% \changes{v3.09}{2011/03/09}{new (internal)} % \begin{macro}{\@sAfterPackage} % These macros add stuff to a load-file-hook of a file, class or % package. First argument is the name of the file (with extension), @@ -652,7 +684,31 @@ \newcommand*{\BeforeClass}[1]{% \scr@set@load@hook{before}{#1.\@clsextension}} \newcommand*{\AfterClass}{% - \@ifstar {\@sAfterClass}{\@AfterClass}} + \@ifstar {\@sAfterClass}{% + \@ifnextchar +\@@AfterClass{% + \@ifnextchar !\@@@AfterClass\@AfterClass + }% + }% +} +\newcommand*{\@@@AfterClass}[2]{% + \begingroup\ifx\csname #2.\@clsextension-h@@k\endcsname\relax + \aftergroup\@sAfterClass + \else + \aftergroup\AfterAtEndOfClass + \fi + \endgroup{#2}% +} +\newcommand*{\AfterAtEndOfClass}[1]{% + \scr@set@load@hook{lateafter}{#1.\@clsextension}} +\newcommand*{\@@AfterClass}[2]{% + \begingroup + \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax + \aftergroup\@sAfterClass + \else + \aftergroup\@AfterClass + \fi + \endgroup{#2}% +} \newcommand*{\@AfterClass}[1]{% \scr@set@load@hook{after}{#1.\@clsextension}} \newcommand*{\@sAfterClass}[1]{% @@ -668,7 +724,31 @@ \newcommand*{\BeforePackage}[1]{% \scr@set@load@hook{before}{#1.\@pkgextension}} \newcommand*{\AfterPackage}{% - \@ifstar {\@sAfterPackage}{\@AfterPackage}} + \@ifstar {\@sAfterPackage}{% + \@ifnextchar +\@@AfterPackage{% + \@ifnextchar !\@@@AfterPackage\@AfterPackage + }% + }% +} +\newcommand*{\@@@AfterPackage}[2]{% + \begingroup\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax + \aftergroup\@sAfterPackage + \else + \aftergroup\AfterAtEndOfPackage + \fi + \endgroup{#2}% +} +\newcommand*{\AfterAtEndOfPackage}[1]{% + \scr@set@load@hook{lateafter}{#1.\@pkgextension}} +\newcommand*{\@@AfterPackage}[2]{% + \begingroup + \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax + \aftergroup\@sAfterPackage + \else + \aftergroup\@AfterPackage + \fi + \endgroup{#2}% +} \newcommand*{\@AfterPackage}[1]{% \scr@set@load@hook{after}{#1.\@pkgextension}} \newcommand*{\@sAfterPackage}[1]{% @@ -692,6 +772,12 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro}{\PreventPackageFromLoading} % \changes{v3.08}{2010/11/04}{New} diff --git a/Master/texmf-dist/source/latex/koma-script/scrmain.ins b/Master/texmf-dist/source/latex/koma-script/scrmain.ins index b99a4f66ca7..35c6d9555d2 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrmain.ins +++ b/Master/texmf-dist/source/latex/koma-script/scrmain.ins @@ -224,6 +224,17 @@ }% }% +\generate{\usepreamble\defaultpreamble + \file{scrfontsizes.sty}{% + \ifbeta\from{scrbeta.dtx}{package,scrfontsizes}\fi + \from{scrkvers.dtx}{package}% + \from{scrkfont.dtx}{package,generator,identify}% + \from{scrkfont.dtx}{package,generator,option}% + \from{scrkfont.dtx}{package,generator,body}% + \from{scrlogo.dtx}{logo}% + }% +}% + \generate{\usepreamble\defaultpreamble \file{scrlttr2.cls}{% \ifbeta\from{scrbeta.dtx}{class,letter}\fi diff --git a/Master/texmf-dist/source/latex/koma-script/scrtime.dtx b/Master/texmf-dist/source/latex/koma-script/scrtime.dtx index 8cda00af115..c1017383c40 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrtime.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrtime.dtx @@ -1,4 +1,4 @@ -% \CheckSum{282} +% \CheckSum{284} % \iffalse % ====================================================================== % scrtime.dtx @@ -58,7 +58,7 @@ %%% From File: scrtime.dtx %<*driver> % \fi -\ProvidesFile{scrtime.dtx}[2011/01/18 v3.08 KOMA-Script +\ProvidesFile{scrtime.dtx}[2011/03/31 v3.08b KOMA-Script (packages scrtime and scrdate)] % \iffalse % @@ -453,12 +453,14 @@ % \end{macrocode} % Last we have to select this new |\date|\emph{language}. % \changes{v1.1j}{2000/01/20}{use of \cs{languagename} if defined} +% \changes{v3.08b}{2011/03/31}{one \% added} % \begin{macrocode} - \@ifundefined{languagename}{ + \@ifundefined{languagename}{% \scrdate@languagenamewarning \ifnum\language=\@nameuse{l@#1} \@nameuse{date#1}% - \fi}{% + \fi + }{% \@ifundefined{date\languagename}% {}% {\@nameuse{date\languagename}}% @@ -488,6 +490,20 @@ {Donnerstag}{Freitag}{Samstag}{Sonntag} % \end{macrocode} % \end{macro} +% \begin{macro}{\dayname@naustrian} +% \changes{v3.08b}{2011/02/22}{new language ``naustrian''.} +% \begin{macrocode} +\newdaylanguage{naustrian}{Montag}{Dienstag}{Mittwoch} + {Donnerstag}{Freitag}{Samstag}{Sonntag} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\dayname@austrian} +% \changes{v3.08b}{2011/02/22}{new language ``austrian''.} +% \begin{macrocode} +\newdaylanguage{austrian}{Montag}{Dienstag}{Mittwoch} + {Donnerstag}{Freitag}{Samstag}{Sonntag} +% \end{macrocode} +% \end{macro} % \begin{macro}{\dayname@english} % \changes{v1.1g}{1997/06/21}{correct name is ``tuesday''.} % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx index 3d94017db18..055b5b8382e 100644 --- a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx +++ b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1146} +% \CheckSum{1211} % \iffalse meta-comment % ====================================================================== % tocbasic.dtx @@ -66,7 +66,7 @@ %%% From File: tocbasic.dtx %<*dtx|package|driver|doc|load> % \fi -\def\tocbasicversion{2010/10/01 v3.07a} +\def\tocbasicversion{2011/03/23 v3.09} % \iffalse % %<*dtx> @@ -1007,56 +1007,69 @@ prior sections for more informations about this. The optional parameter \PName{options} is a comma separated list of \emph{key}=\emph{value} pairs. \begin{description} -\item[\normalfont\PValue{owner}=\PName{string}]\hfill\\* - The owner as described in the sections before. If no owner was given owner - \PValue{float} will be used. -\item[\normalfont\PValue{type}=\PName{string}]\hfill\\* - sets the type of the new declared list. The type will be used e.g. to - defined a \Macro{listof}\PName{string}. If no type is set up the extension - from the mandatory argument will be used. -\item[\normalfont\PValue{types}=\PName{string}]\hfill\\* - the plural of the type. If no plural was given the value of \PValue{type} - with postfix ``s'' will be used. -\item[\normalfont\PValue{name}=\PName{string}]\hfill\\* - The name of an element. If no name is given, the value of \PValue{type} with - upper case first char will be used. -\item[\normalfont\PValue{listname}=\PName{string}]\hfill\\* - The name of the list of foo. If not given the value of \PValue{types} with - upper case first char prefixed by ``List of '' will be used. -\item[\normalfont\PValue{forcenames}]\hfill\\* - If set, the names will be even defined, if they where already defined - before. -\item[\normalfont\PValue{level}=\PName{number}]\hfill\\* - The level of the entries of that list. If not given level 1 will be used - like standard classes use for entries to list of figures or list of tables. -\item[\normalfont\PValue{indent}=\PName{length}]\hfill\\* - The indent value for the entries of that list. If not given, 1\,em will be - used like standard classes use for entries to list of figures or list of - tables. -\item[\normalfont\PValue{hang}=\PName{length}]\hfill\\* - The amount of the hanging indent of the entries for that list. If not given, - 1.5\,em will be used like standard classes use for entries to list of - figures or list of tables. +\item[\normalfont\PValue{atbegin}=\PName{code}]\hfill\\* + The \PName{code} will be executed at the begin of the float or nonfloat + environment. +\item[\normalfont\PValue{atend}=\PName{code}]\hfill\\* + The \PName{code} will be executed at the end of the float or nonfloat + environment. +%^^A not yet implemented +%^^A \item[\normalfont\PValue{captionpos}=\PName{position}]\hfill\\* +%^^A If \PName{position} is \PValue{top} or \PValue{above} the spacing above +%^^A and below the caption will be done for captions above objects. If +%^^A \PName{position} is \PValue{bot}, \PValue{bottom}, or \PValue{below} the +%^^A spacing above and below the caption will be done for captions below +%^^A objects. +\item[\normalfont\PValue{counterwithin}=\PName{parent counter}]\hfill\\* + If you define a float or nonfloat, the captions will be numbered. You may + declare another counter to be the parent counter. In this case, the parent + counter will be set before the float counter and the float counter will be + reset whenever the parent counter is increased using \Macro{stepcounter} + oder \Macro{refstepcounter}. \item[\normalfont\PValue{float}]\hfill\\* If set, float environments for that type will be defined. The names of the environments are the value of \PName{type} and for double column floats the value of \PName{type} with postfix ``\PValue{*}''. +\item[\normalfont\PValue{floatpos}=\PName{float positions}]\hfill\\* + The default floating-position of the float. If no float position was given, + ``tbp'' will be used like the standard classes do for figures and tables. \item[\normalfont\PValue{floattype}=\PName{number}]\hfill\\* The numericle float type of the defined floats. Float types with common bits cannot be reordered. At the standard classes figures has float type 1 and tables has float type 2. If no float type was given, 16 will be used. -\item[\normalfont\PValue{floatpos}=\PName{float positions}]\hfill\\* - The default floating-position of the float. If no float position was given, - ``tbp'' will be used like the standard classes do for figures and tables. +\item[\normalfont\PValue{forcenames}]\hfill\\* + If set, the names will be even defined, if they where already defined + before. +\item[\normalfont\PValue{hang}=\PName{length}]\hfill\\* + The amount of the hanging indent of the entries for that list. If not given, + 1.5\,em will be used like standard classes use for entries to list of + figures or list of tables. +\item[\normalfont\PValue{indent}=\PName{length}]\hfill\\* + The indent value for the entries of that list. If not given, 1\,em will be + used like standard classes use for entries to list of figures or list of + tables. +\item[\normalfont\PValue{level}=\PName{number}]\hfill\\* + The level of the entries of that list. If not given level 1 will be used + like standard classes use for entries to list of figures or list of tables. +\item[\normalfont\PValue{listname}=\PName{string}]\hfill\\* + The name of the list of foo. If not given the value of \PValue{types} with + upper case first char prefixed by ``List of '' will be used. +\item[\normalfont\PValue{name}=\PName{string}]\hfill\\* + The name of an element. If no name is given, the value of \PValue{type} with + upper case first char will be used. \item[\normalfont\PValue{nonfloat}]\hfill\\* If set, a non floating environment will be defined. The name of the environment is the value of \PName{type} with postfix ``\PValue{-}''. -\item[\normalfont\PValue{counterwithin}=\PName{parent counter}]\hfill\\* - If you define a float or nonfloat, the captions will be numbered. You may - declare another counter to be the parent counter. In this case, the parent - counter will be set before the float counter and the float counter will be - reset whenever the parent counter is increased using \Macro{stepcounter} - oder \Macro{refstepcounter}. +\item[\normalfont\PValue{owner}=\PName{string}]\hfill\\* + The owner as described in the sections before. If no owner was given owner + \PValue{float} will be used. +\item[\normalfont\PValue{type}=\PName{string}]\hfill\\* + sets the type of the new declared list. The type will be used e.g. to + defined a \Macro{listof}\PName{string}. If no type is set up the extension + from the mandatory argument will be used. +\item[\normalfont\PValue{types}=\PName{string}]\hfill\\* + the plural of the type. If no plural was given the value of \PValue{type} + with postfix ``s'' will be used. \end{description} @@ -1475,6 +1488,8 @@ be defined and used in \Macro{tocbasic@listhead}. % \end{macro} % % \begin{macro}{\doforeachtocfile} +% \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead +% of \cs{def}} % This command does the second, mandatory argument for each toc-file at the % list of toc-files. If the first, optional argument was given this will be % done only for the toc-files of that owner. NOTE: An empty first argument @@ -1577,7 +1592,7 @@ be defined and used in \Macro{tocbasic@listhead}. \setlength{\parskip}{\z@}% \setlength{\parindent}{\z@}% \setlength{\parfillskip}{\z@\@plus 1fil}% - \def\@currext{#1}% + \edef\@currext{#1}% \csname tocbasic@@before@hook\endcsname \csname tb@#1@before@hook\endcsname \@starttoc{#1}% @@ -1643,6 +1658,8 @@ be defined and used in \Macro{tocbasic@listhead}. % \begin{macro}{\listoftoc*} % \changes{v1.0a}{2008/11/12}{\cs{twocolumn} fixed}% % \changes{v1.01}{2008/11/13}{new feature \texttt{onecolumn}} +% \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead +% of \cs{def}} % Command to handle the hole list of something. There are additional hooks % for this. The first optional argument is the title for this list. If the % optional argument was omitted \cs{listof\#2name} will be used. The star @@ -1667,7 +1684,7 @@ be defined and used in \Macro{tocbasic@listhead}. }{% \expandafter\let\expandafter\list@fname\csname listof#2name\endcsname }% - \def\@currext{#2}% + \edef\@currext{#2}% \iftocfeature{\@currext}{onecolumn}{% \iftocfeature{\@currext}{leveldown}{}{% \if@twocolumn @@ -1957,6 +1974,7 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{type}{#1}{\edef\tb@nt@type{#1}}% } % \end{macrocode} +% \begin{macro}{\tb@nt@counterwithin} % If a counter will be defined, this counter may depend on another counter % (like figure counter depends on chapter counter at book classes). If the % value is empty, the counter does not depend on any other counter. @@ -1965,6 +1983,8 @@ be defined and used in \Macro{tocbasic@listhead}. \edef\tb@nt@counterwithin{#1}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@types} % Sometimes the plural of the type is needed and may be defined by a % seperate option. % \begin{macrocode} @@ -1972,6 +1992,8 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{types}{#1}{\edef\tb@nt@types{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@ext} % Don't tell the user, that the mandatory argument of the command may be % overloaded by this option. This was only done to simplify the definition. % \begin{macrocode} @@ -1979,12 +2001,16 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{extension}{#1}{\edef\tb@nt@ext{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@owner} % The owner of the new list extension. % \begin{macrocode} \define@key{tocbasic}{owner}{% \tb@ifvalueisnotempty{owner}{#1}{\edef\tb@nt@owner{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@name} % We need a name/term for the entries of the new list. This may e.g. be used % for |caption| output. A |\name| will also be defined. % \begin{macrocode} @@ -1992,12 +2018,15 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{name}{#1}{\edef\tb@nt@name{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@listname} % The list itself has a heading. A |\listname| will also be defined. % \begin{macrocode} \define@key{tocbasic}{listname}{% \tb@ifvalueisnotempty{listname}{#1}{\edef\tb@nt@listname{#1}}% } % \end{macrocode} +% \end{macro} % \begin{macro}{\iftb@forcenames} % \changes{v3.06}{2010/06/01}{new internal} % The |\...name| commands will only be defined, if they are not already @@ -2011,6 +2040,7 @@ be defined and used in \Macro{tocbasic@listhead}. } % \end{macrocode} % \end{macro} +% \begin{macro}{\tb@nt@level} % Each entry to a TOC/list of has a numeric level. You may set up your own % level. % \begin{macrocode} @@ -2018,6 +2048,8 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{level}{#1}{\tb@numkey\tb@nt@level{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@indent} % Earch entry of a TOC/list of is idented on the left side. This is the % amount of the indention of the number part. % \begin{macrocode} @@ -2025,6 +2057,8 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{indent}{#1}{\tb@dimkey\tb@nt@indent{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@hang} % Earch entry of a TOC/list of is idented on the left side. This is the % amount of the indention of the text of the entry. % \begin{macrocode} @@ -2032,6 +2066,7 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{hang}{#1}{\tb@dimkey\tb@nt@hang{#1}}% } % \end{macrocode} +% \end{macro} % \begin{macro}{\iftb@float} % \changes{v3.06}{2010/06/01}{new internal} % This boolean indicates, that float environments should also be defined. @@ -2053,6 +2088,7 @@ be defined and used in \Macro{tocbasic@listhead}. } % \end{macrocode} % \end{macro} +% \begin{macro}{\tb@nt@floattype} % Simply the value for the |\ftype@...| macro. It has to be % $1<=\textrm{value}<=31$. % \begin{macrocode} @@ -2060,12 +2096,33 @@ be defined and used in \Macro{tocbasic@listhead}. \tb@ifvalueisnotempty{floattype}{#1}{\tb@numkey\tb@nt@floattype{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@floatpos} % Simply the value for the |\fps@...| macro. % \begin{macrocode} \define@key{tocbasic}{floatpos}{% \tb@ifvalueisnotempty{floatpos}{#1}{\edef\tb@nt@floatpos{#1}}% } % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@atbegin} +% \changes{v3.09}{new optional identifier \texttt{atbegin}} +% Additional code executed at the begin of a new defined environment. +% \begin{macrocode} +\define@key{tocbasic}{atbegin}{% + \tb@ifvalueisnotempty{atbegin}{#1}{\def\tb@nt@atbegin{#1}}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@atend} +% \changes{v3.09}{new optional identifier \texttt{atbend}} +% Additional code executed at the end of a new defined environment. +% \begin{macrocode} +\define@key{tocbasic}{atend}{% + \tb@ifvalueisnotempty{atend}{#1}{\def\tb@nt@atend{#1}}% +} +% \end{macrocode} +% \end{macro} % Now the command to define a new list and maybe float or nonfloat. % \begin{macrocode} \newcommand*{\DeclareNewTOC}[2][]{% @@ -2083,7 +2140,9 @@ be defined and used in \Macro{tocbasic@listhead}. \def\tb@nt@level{1}% \def\tb@nt@indent{1em}% \def\tb@nt@hang{1.5em}% - \let\tb@nt@counterwithin\@empty% + \let\tb@nt@counterwithin\@empty + \let\tb@nt@atbegin\@empty + \let\tb@nt@atend\@empty \setkeys{tocbasic}{#1}% % \end{macrocode} % First of all, every TOC needs a extension, that should be added to the @@ -2142,19 +2201,23 @@ be defined and used in \Macro{tocbasic@listhead}. \expandafter\newcommand\expandafter*\csname ftype@\tb@nt@type\expandafter \endcsname{\tb@nt@floattype}% \begingroup - \edef\@tempa{% - \noexpand\endgroup - \noexpand\newenvironment{\tb@nt@type}{% - \noexpand\@float{\tb@nt@type}% - }{% - \noexpand\end@float - }% - \noexpand\newenvironment{\tb@nt@type*}{% - \noexpand\@dblfloat{\tb@nt@type}% - }{% - \noexpand\end@dblfloat - }% - }% + \edef\@tempa{% + \noexpand\endgroup + \noexpand\newenvironment{\tb@nt@type}{% + \noexpand\@float{\tb@nt@type}% + \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname + }{% + \noexpand\csname \tb@nt@type @atend\noexpand\endcsname + \noexpand\end@float + }% + \noexpand\newenvironment{\tb@nt@type*}{% + \noexpand\@dblfloat{\tb@nt@type}% + \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname + }{% + \noexpand\csname \tb@nt@type @atend\noexpand\endcsname + \noexpand\end@dblfloat + }% + }% \@tempa \@tempswatrue \fi @@ -2169,7 +2232,9 @@ be defined and used in \Macro{tocbasic@listhead}. \noexpand\trivlist\noexpand\item\noexpand\relax \noexpand\minipage{\noexpand\linewidth}% \noexpand\def\noexpand\@captype{\tb@nt@type}% + \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname }{% + \noexpand\csname \tb@nt@type @atend\noexpand\endcsname \noexpand\endminipage\noexpand\endtrivlist }% }% @@ -2177,7 +2242,7 @@ be defined and used in \Macro{tocbasic@listhead}. \@tempswatrue \fi % \end{macrocode} -% The counter of float and nonfloat environments: +% The counter and hooks of float and nonfloat environments: % \begin{macrocode} \if@tempswa \@ifundefined{c@\tb@nt@type}{% @@ -2212,6 +2277,10 @@ be defined and used in \Macro{tocbasic@listhead}. }% }% \@tempa + \expandafter\newcommand\expandafter*\csname \tb@nt@type @atbegin\expandafter + \endcsname\expandafter{\tb@nt@atbegin}% + \expandafter\newcommand\expandafter*\csname \tb@nt@type @atend\expandafter + \endcsname\expandafter{\tb@nt@atend}% \fi } % \end{macrocode} @@ -2274,6 +2343,8 @@ be defined and used in \Macro{tocbasic@listhead}. % \end{macro} % \end{macro} % +% +% % \iffalse % %<*load> diff --git a/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx b/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx index eb315d0d1f4..ffa4a72d392 100644 --- a/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx +++ b/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx @@ -1936,7 +1936,8 @@ usefull to define your own toc styles. but there's no TOC style `#2' defined.}% }{% \def\settocfeature{% - \@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}% + \@ifnextchar[ %] + {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}% }% \let\settocstylefeature\settocfeature % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 0f8188f7095..2efce460920 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 78272d6849f..35463aef556 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 5d5327f1ae1..e2858c958a4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 21e507ba9d6..2f9c21e4757 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 50b372375d4..fe384673955 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 48f03ff1de7..ee5f215d9db 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 ff4ef36643c..5de910ffd59 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 21834fdfeef..a9901de1b8c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 512c728e5a5..b8bdbf008c8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 88c7b914166..249cb32a4f4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 bc0eeae798b..9712972e1e2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 d28d329e5d0..b704cb86353 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 62e35859e71..4d246cd208f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 4e2a1813d49..f578e8e5711 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 1f22bd20247..d300bb6b9d2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/10/01 v3.07a} +\def\tocbasicversion{2011/03/23 v3.09} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \addtotoclist{toc} @@ -182,6 +182,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -618,31 +620,49 @@ \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: scrkfloa.dtx +\newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse +\newif\if@figurecaptionabove\@figurecaptionabovefalse \newif\ifonelinecaptions\onelinecaptionstrue \newcommand*{\scap@pos}{r} \newcommand*{\scap@valign}{b} \KOMA@key{captions}{% \KOMA@set@ncmdkey{captions}{@tempa}{% - {tableheading}{0},% - {tableabove}{0},{abovetable}{0},{abovetabular}{0},{topattable}{0},% - {tablesignature}{1},% - {tablebelow}{1},{belowtable}{1},{belowtabular}{1},{bottomattable}{1},% - {oneline}{2},% - {nooneline}{3},% - {rightbeside}{4},{besideright}{4},% - {leftbeside}{5},{besideleft}{5},% - {innerbeside}{6},{besideinner}{6},% - {outerbeside}{7},{besideouter}{7},% - {topbeside}{8},{besidetop}{8},% - {centeredbeside}{9},{besidecentered}{9},% - {middlebeside}{9},{besidemiddle}{9},% - {bottombeside}{10},{besidebottom}{10}% + {heading}{0},{above}{0},{top}{0},% + {signature}{1},{below}{1},{bot}{1},{bottom}{1},% + {tableheading}{2},% + {tableabove}{2},{abovetable}{2},{abovetabular}{2},{topattable}{2},% + {tablesignature}{3},% + {tablebelow}{3},{belowtable}{3},{belowtabular}{3},{bottomattable}{3},% + {figureheading}{4},{figureabove}{4},{abovefigure}{4},{topatfigure}{4},% + {figuresignature}{5},{figurebelow}{5},{belowfigure}{5},{bottomatfigure}{5},% + {oneline}{6},% + {nooneline}{7},% + {rightbeside}{8},{besideright}{8},% + {leftbeside}{9},{besideleft}{9},% + {innerbeside}{10},{besideinner}{10},% + {outerbeside}{11},{besideouter}{11},% + {topbeside}{12},{besidetop}{12},% + {centeredbeside}{13},{besidecentered}{13},% + {middlebeside}{13},{besidemiddle}{13},% + {bottombeside}{14},{besidebottom}{14}% }{#1}% \ifcase \@tempa\relax \@tablecaptionabovetrue + \@figurecaptionabovetrue + \@captionabovetrue + \or + \@tablecaptionabovefalse + \@figurecaptionabovefalse + \@captionabovefalse + \or + \@tablecaptionabovetrue \or \@tablecaptionabovefalse + \or + \@figurecaptionabovetrue + \or + \@figurecaptionabovefalse \or \onelinecaptionstrue \or @@ -1171,7 +1191,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listiv\endcsname \endgroup - \def\@listiv{\leftmargin\leftmarginiv + \edef\@listiv{\leftmargin\leftmarginiv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1180,7 +1200,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listv\endcsname \endgroup - \def\@listv{\leftmargin\leftmarginv + \edef\@listv{\leftmargin\leftmarginv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1189,7 +1209,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listvi\endcsname \endgroup - \def\@listvi{\leftmargin\leftmarginvi + \edef\@listvi{\leftmargin\leftmarginvi \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -2075,7 +2095,6 @@ \setlength{\abovecaptionskip}{10\p@} \setlength{\belowcaptionskip}{0\p@} \newcommand*{\captionformat}{:\ } -\newif\if@captionabove\@captionabovefalse \newcommand{\scr@caption}{} \AtBeginDocument{\let\scr@caption\caption} \newcommand{\captionabove}{\@captionabovetrue\scr@caption} @@ -2541,7 +2560,9 @@ \setcounter{dbltopnumber}{2} \renewcommand*\dbltopfraction{.7} \renewcommand*\dblfloatpagefraction{.5} -\newcommand*{\captionof}[1]{\def\@captype{#1}\caption} +\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption} +\newcommand*{\captionaboveof}{\@captionabovetrue\captionof} +\newcommand*{\captionbelowof}{\@captionabovefalse\captionof} \BeforePackage{capt-of}{\let\captionof\relax} \newcommand*\figurename{Figure} \newcommand*\tablename{Table} @@ -2557,11 +2578,15 @@ \newcommand*{\ext@figure}{lof} \newcommand*{\fnum@figure}{\figureformat} \newenvironment{figure}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@float{figure}% }{% \end@float } \newenvironment{figure*}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@dblfloat{figure}% }{% \end@dblfloat diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index f6eb3aab17e..e563d128946 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -248,7 +248,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: scrklang.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2011/02/11 v3.08a} +\def\scrlfileversion{2011/03/09 v3.09} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -680,7 +680,7 @@ } \newcommand*{\Family@Numerical@Key}{} \def\Family@Numerical@Key#1#2#3[#4]#5#6{% - \@ifundefined{#5}{\@namedef{#5}{0}}% + \@ifundefined{#5}{\@namedef{#5}{0}}{}% \ifx\relax#4\relax \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetNumerical{#2}{#3}{#5}{#6}{##1}}% \else @@ -718,10 +718,10 @@ } \newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{% \@ifnextchar [%] - {\Family@String@Key{#1}{#2}{#3}}{\Family@@String@@Key{#1}{#2}{#3}}% + {\Family@@String@@Key{#1}{#2}{#3}}{\Family@String@Key{#1}{#2}{#3}}% } \newcommand*{\Family@@String@@Key}{} -\long\def\Family@@Numerical@@Key#1#2#3[#4]#5{% +\long\def\Family@@String@@Key#1#2#3[#4]#5{% \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\def#5{##1}}% } \newcommand{\Family@String@Key}[4]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 73c7fd08645..c1e18435e6d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/10/01 v3.07a} +\def\tocbasicversion{2011/03/23 v3.09} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -184,6 +184,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -693,31 +695,49 @@ \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: scrkfloa.dtx +\newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse +\newif\if@figurecaptionabove\@figurecaptionabovefalse \newif\ifonelinecaptions\onelinecaptionstrue \newcommand*{\scap@pos}{r} \newcommand*{\scap@valign}{b} \KOMA@key{captions}{% \KOMA@set@ncmdkey{captions}{@tempa}{% - {tableheading}{0},% - {tableabove}{0},{abovetable}{0},{abovetabular}{0},{topattable}{0},% - {tablesignature}{1},% - {tablebelow}{1},{belowtable}{1},{belowtabular}{1},{bottomattable}{1},% - {oneline}{2},% - {nooneline}{3},% - {rightbeside}{4},{besideright}{4},% - {leftbeside}{5},{besideleft}{5},% - {innerbeside}{6},{besideinner}{6},% - {outerbeside}{7},{besideouter}{7},% - {topbeside}{8},{besidetop}{8},% - {centeredbeside}{9},{besidecentered}{9},% - {middlebeside}{9},{besidemiddle}{9},% - {bottombeside}{10},{besidebottom}{10}% + {heading}{0},{above}{0},{top}{0},% + {signature}{1},{below}{1},{bot}{1},{bottom}{1},% + {tableheading}{2},% + {tableabove}{2},{abovetable}{2},{abovetabular}{2},{topattable}{2},% + {tablesignature}{3},% + {tablebelow}{3},{belowtable}{3},{belowtabular}{3},{bottomattable}{3},% + {figureheading}{4},{figureabove}{4},{abovefigure}{4},{topatfigure}{4},% + {figuresignature}{5},{figurebelow}{5},{belowfigure}{5},{bottomatfigure}{5},% + {oneline}{6},% + {nooneline}{7},% + {rightbeside}{8},{besideright}{8},% + {leftbeside}{9},{besideleft}{9},% + {innerbeside}{10},{besideinner}{10},% + {outerbeside}{11},{besideouter}{11},% + {topbeside}{12},{besidetop}{12},% + {centeredbeside}{13},{besidecentered}{13},% + {middlebeside}{13},{besidemiddle}{13},% + {bottombeside}{14},{besidebottom}{14}% }{#1}% \ifcase \@tempa\relax \@tablecaptionabovetrue + \@figurecaptionabovetrue + \@captionabovetrue + \or + \@tablecaptionabovefalse + \@figurecaptionabovefalse + \@captionabovefalse + \or + \@tablecaptionabovetrue \or \@tablecaptionabovefalse + \or + \@figurecaptionabovetrue + \or + \@figurecaptionabovefalse \or \onelinecaptionstrue \or @@ -1267,7 +1287,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listiv\endcsname \endgroup - \def\@listiv{\leftmargin\leftmarginiv + \edef\@listiv{\leftmargin\leftmarginiv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1276,7 +1296,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listv\endcsname \endgroup - \def\@listv{\leftmargin\leftmarginv + \edef\@listv{\leftmargin\leftmarginv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1285,7 +1305,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listvi\endcsname \endgroup - \def\@listvi{\leftmargin\leftmarginvi + \edef\@listvi{\leftmargin\leftmarginvi \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -2591,7 +2611,6 @@ \setlength{\abovecaptionskip}{10\p@} \setlength{\belowcaptionskip}{0\p@} \newcommand*{\captionformat}{:\ } -\newif\if@captionabove\@captionabovefalse \newcommand{\scr@caption}{} \AtBeginDocument{\let\scr@caption\caption} \newcommand{\captionabove}{\@captionabovetrue\scr@caption} @@ -3057,7 +3076,9 @@ \setcounter{dbltopnumber}{2} \renewcommand*\dbltopfraction{.7} \renewcommand*\dblfloatpagefraction{.5} -\newcommand*{\captionof}[1]{\def\@captype{#1}\caption} +\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption} +\newcommand*{\captionaboveof}{\@captionabovetrue\captionof} +\newcommand*{\captionbelowof}{\@captionabovefalse\captionof} \BeforePackage{capt-of}{\let\captionof\relax} \newcommand*\figurename{Figure} \newcommand*\tablename{Table} @@ -3079,11 +3100,15 @@ \newcommand*{\ext@figure}{lof} \newcommand*{\fnum@figure}{\figureformat} \newenvironment{figure}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@float{figure}% }{% \end@float } \newenvironment{figure*}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@dblfloat{figure}% }{% \end@dblfloat diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 174d65d776e..0261487420d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] @@ -159,11 +159,12 @@ \@namedef{date#1}{% \expandafter\let\expandafter\@dayname\csname dayname@#1\endcsname \@nameuse{D@date#1}}% - \@ifundefined{languagename}{ + \@ifundefined{languagename}{% \scrdate@languagenamewarning \ifnum\language=\@nameuse{l@#1} \@nameuse{date#1}% - \fi}{% + \fi + }{% \@ifundefined{date\languagename}% {}% {\@nameuse{date\languagename}}% @@ -176,6 +177,10 @@ {Donnerstag}{Freitag}{Samstag}{Sonntag} \newdaylanguage{ngerman}{Montag}{Dienstag}{Mittwoch} {Donnerstag}{Freitag}{Samstag}{Sonntag} +\newdaylanguage{naustrian}{Montag}{Dienstag}{Mittwoch} + {Donnerstag}{Freitag}{Samstag}{Sonntag} +\newdaylanguage{austrian}{Montag}{Dienstag}{Mittwoch} + {Donnerstag}{Freitag}{Samstag}{Sonntag} \newdaylanguage{english}{Monday}{Tuesday}{Wednesday} {Thursday}{Friday}{Saturday}{Sunday} \newdaylanguage{USenglish}{Monday}{Tuesday}{Wednesday} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 48343f8399f..8757a288438 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -97,7 +97,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrextend.dtx \ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package @@ -223,6 +223,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -602,7 +604,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listiv\endcsname \endgroup - \def\@listiv{\leftmargin\leftmarginiv + \edef\@listiv{\leftmargin\leftmarginiv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -611,7 +613,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listv\endcsname \endgroup - \def\@listv{\leftmargin\leftmarginv + \edef\@listv{\leftmargin\leftmarginv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -620,7 +622,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listvi\endcsname \endgroup - \def\@listvi{\leftmargin\leftmarginvi + \edef\@listvi{\leftmargin\leftmarginvi \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty new file mode 100644 index 00000000000..7bae22fb1e5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -0,0 +1,367 @@ +%% +%% This is file `scrfontsizes.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrkvers.dtx (with options: `package') +%% scrkfont.dtx (with options: `package,generator,identify') +%% scrkfont.dtx (with options: `package,generator,option') +%% scrkfont.dtx (with options: `package,generator,body') +%% scrlogo.dtx (with options: `logo') +%% +%% Copyright (c) 1994-2011 +%% 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 +%% . +%% +%%% 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{2011/04/02 v3.09 KOMA-Script}% +\endgroup +%%% From File: scrkfont.dtx +\ProvidesPackage{scrfontsizes}[% + \KOMAScriptVersion\space package + (font size file generator)] +%%% From File: scrkfont.dtx +\ProcessOptions\relax +%%% From File: scrkfont.dtx +\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} +\newcommand*{\generatefontfile}[1]{% + \ifstr{#1}{scrsize}{% + \ClassError{\KOMAClassName}{% + Font file name `scrsize' not allowed% + }{% + Font files with name `scrsize.clo' are reserved for + KOMA-Script.\MessageBreak + You should use another prefix and rename \string\@fontsizefilebase\space + either before\MessageBreak + loading a KOMA-Script class using one of \string\documentclass, + \string\LoadClass,\MessageBreak + or \string\LoadClassWithOptions\space or before loading package + `scrextend' using another\MessageBreak + class.}% + \@@@generatefontfile + }{% + \@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}% + }% +} +\newcommand*{\@generatefontfile}{} +\def\@generatefontfile#1[#2]#3{% + \begingroup + \@ifundefined{setparsizes}{\setlength{\parskip}{0pt}}% + {\setparsizes{0pt}{0pt}{0pt}}% + \changefontsizes[{#2}]{#3}% + \generate@fontfile{#1}{#3}% + \endgroup +} +\newcommand\@@generatefontfile[2]{% + \begingroup + \@ifundefined{setparsizes}{\setlength{\parskip}{0pt}}% + {\setparsizes{0pt}{0pt}{0pt}}% + \changefontsizes{#2}% + \generate@fontfile{#1}{#2}% + \endgroup +} +\newcommand*{\@@@generatefontfile}[2][]{} +\newcommand*{\@fontfile}{} +\let\@fontfile\@mainaux +\newcommand*{\generate@fontfile}[2]{% + \def\@ind{\space\space}% + \immediate\openout\@fontfile #1#2.clo + \immediate\write\@fontfile{\@percentchar^^J% + \@percentchar\space This is file `#1#2.clo', generated with^^J% + \@percentchar\space scrfontsizes + \csname ver@scrfontsizes.sty\endcsname,^^J% + \@percentchar\space Copyright (c) Markus Kohm.^^J% + \@percentchar^^J% + \string\ProvidesFile{#1#2.clo}[% + \the\year/\ifnum\month<10 0\fi\the\month/\ifnum\day<10 0\fi\the\day% + \space generated font size class option (#2)]}% + \immediate\write\@fontfile{% + \string\def\string\normalsize{\@percentchar^^J% + \@ind\string\@setfontsize\string\normalsize{\f@size}{\f@baselineskip}% + \@percentchar^^J% + \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J% + \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J% + \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J% + \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J% + \@ind\string\let\string\@listi\string\@listI^^J% + }\@percentchar% + }% + \begingroup\small\@listi + \immediate\write\@fontfile{% + \string\def\string\small{\@percentchar^^J% + \@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}% + \@percentchar^^J% + \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J% + \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J% + \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J% + \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J% + \@ind\string\def\string\@listi{\@percentchar^^J% + \@ind\@ind\string\leftmargin\string\leftmargini^^J% + \@ind\@ind\string\topsep \the\topsep^^J% + \@ind\@ind\string\parsep \the\parsep^^J% + \@ind\@ind\string\itemsep \string\parsep^^J% + \@ind}\@percentchar^^J% + }\@percentchar% + }% + \endgroup + \begingroup\footnotesize\@listi + \immediate\write\@fontfile{% + \string\def\string\footnotesize{\@percentchar^^J% + \@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}% + \@percentchar^^J% + \@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J% + \@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J% + \@ind\string\belowdisplayskip\space \the\belowdisplayskip^^J% + \@ind\string\belowdisplayshortskip\space \the\belowdisplayshortskip^^J% + \@ind\string\def\string\@listi{\@percentchar^^J% + \@ind\@ind\string\leftmargin\string\leftmargini^^J% + \@ind\@ind\string\topsep \the\topsep^^J% + \@ind\@ind\string\parsep \the\parsep^^J% + \@ind\@ind\string\itemsep \string\parsep^^J% + \@ind}\@percentchar^^J% + }\@percentchar% + }% + \endgroup + \begingroup\scriptsize + \immediate\write\@fontfile{% + \string\def\string\scriptsize{% + \string\@setfontsize\string\scriptsize{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\tiny + \immediate\write\@fontfile{% + \string\def\string\tiny{% + \string\@setfontsize\string\tiny{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\large + \immediate\write\@fontfile{% + \string\def\string\large{% + \string\@setfontsize\string\large{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\Large + \immediate\write\@fontfile{% + \string\def\string\Large{% + \string\@setfontsize\string\Large{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\LARGE + \immediate\write\@fontfile{% + \string\def\string\LARGE{% + \string\@setfontsize\string\LARGE{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\huge + \immediate\write\@fontfile{% + \string\def\string\huge{% + \string\@setfontsize\string\huge{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \begingroup\Huge + \immediate\write\@fontfile{% + \string\def\string\Huge{% + \string\@setfontsize\string\Huge{\f@size}{\f@baselineskip}% + }\@percentchar% + }% + \endgroup + \immediate\write\@fontfile{\string\normalsize}% + \immediate\write\@fontfile{% + \string\setlength{\string\footnotesep}{\the\footnotesep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\skip\string\footins}{\the\skip\footins}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\floatsep}{\the\floatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\textfloatsep}{\the\textfloatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\intextsep}{\the\intextsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\dblfloatsep}{\the\dblfloatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\dbltextfloatsep}{\the\dbltextfloatsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@fptop}{\the\@fptop}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@fpsep}{\the\@fpsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@fpbot}{\the\@fpbot}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@dblfptop}{\the\@dblfptop}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@dblfpsep}{\the\@dblfpsep}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\@dblfpbot}{\the\@dblfpbot}\@percentchar + }% + \immediate\write\@fontfile{% + \string\setlength{\string\partopsep}{\the\partopsep}\@percentchar + }% + \begingroup + \@listi + \immediate\write\@fontfile{% + \string\def\string\@listi{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmargini^^J% + \@ind\string\topsep \the\topsep^^J% + \@ind\string\parsep \the\parsep^^J% + \@ind\string\itemsep \string\parsep^^J% + }\@percentchar + }% + \endgroup + \immediate\write\@fontfile{% + \string\let\string\@listI\string\@listi + }% + \begingroup + \@listii + \immediate\write\@fontfile{% + \string\def\string\@listii{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginii^^J% + \@ind\string\labelwidth\string\leftmarginii^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + \@ind\string\topsep \the\topsep^^J% + \@ind\string\parsep \the\parsep^^J% + \@ind\string\itemsep \string\parsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listiii + \immediate\write\@fontfile{% + \string\def\string\@listiii{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginiii^^J% + \@ind\string\labelwidth\string\leftmarginiii^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + \@ind\string\topsep \the\topsep^^J% + \@ind\string\parsep \the\parsep^^J% + \@ind\string\partopsep \the\partopsep^^J% + \@ind\string\itemsep \string\topsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listiv + \immediate\write\@fontfile{% + \string\def\string\@listiv{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginiv^^J% + \@ind\string\labelwidth\string\leftmarginiv^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listv + \immediate\write\@fontfile{% + \string\def\string\@listv{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginv^^J% + \@ind\string\labelwidth\string\leftmarginv^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + }\@percentchar + }% + \endgroup + \begingroup + \@listvi + \immediate\write\@fontfile{% + \string\def\string\@listvi{\@percentchar^^J% + \@ind\string\leftmargin\string\leftmarginvi^^J% + \@ind\string\labelwidth\string\leftmarginvi^^J% + \@ind\string\advance\string\labelwidth-\string\labelsep^^J% + }\@percentchar + }% + \endgroup + \immediate\write\@fontfile{% + \string\@ifundefined{@list@extra}{}{\@percentchar^^J% + \@ind\string\l@addto@macro{\string\@listi}{\string\@list@extra}% + \@percentchar^^J% + \@ind\string\let\string\@listI=\string\@listi^^J% + \@ind\string\l@addto@macro{\string\@listii}{\string\@list@extra}% + \@percentchar^^J% + \@ind\string\l@addto@macro{\string\@listiii}{\string\@list@extra}% + \@percentchar^^J% + \@ind\string\l@addto@macro{\string\footnotesize}{\string\protect + \string\add@extra@listi{ftns}}\@percentchar^^J% + \@ind\string\l@addto@macro{\string\small}{\string\protect + \string\add@extra@listi{sml}}\@percentchar^^J% + }\@percentchar^^J% + \string\@listi^^J% + \string\endinput^^J% + \@percentchar^^J% + \@percentchar\space End of file `#1#2.clo'. + } + \immediate\closeout\@fontfile +} +\@onlypreamble\generatefontfile +%%% From File: scrlogo.dtx +\@ifundefined{KOMAScript}{% + \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% + M\kern.05em A\kern.1em-\kern.1em Script}}}{} +\endinput +%% +%% End of file `scrfontsizes.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 0ca01529a41..0866e3a42ab 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 4aad7968859..845428567d3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -85,7 +85,7 @@ \KOMAProcessOptions\relax %%% From File: scrkfont.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2011/02/11 v3.08a} +\def\scrlfileversion{2011/03/09 v3.09} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 6742cb82fdb..7ce524a34c4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -41,7 +41,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: scrlfile.dtx -\def\scrlfileversion{2011/02/11 v3.08a} +\def\scrlfileversion{2011/03/09 v3.09} \ProvidesPackage{scrlfile}[% \scrlfileversion\space KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% @@ -98,6 +98,7 @@ \noexpand\@onefilewithoptions{\csname #1.#4-@aliasname\endcsname}}% \fi \scr@@onefilewithoptions[{#2}][{#3}]{#4}% + \scr@load@hook{lateafter}{#1.#4}% } \newcommand*{\ReplaceFile}[2]{% \expandafter\edef\csname #1-@alias\endcsname{#2}% @@ -126,7 +127,31 @@ \newcommand*{\BeforeClass}[1]{% \scr@set@load@hook{before}{#1.\@clsextension}} \newcommand*{\AfterClass}{% - \@ifstar {\@sAfterClass}{\@AfterClass}} + \@ifstar {\@sAfterClass}{% + \@ifnextchar +\@@AfterClass{% + \@ifnextchar !\@@@AfterClass\@AfterClass + }% + }% +} +\newcommand*{\@@@AfterClass}[2]{% + \begingroup\ifx\csname #2.\@clsextension-h@@k\endcsname\relax + \aftergroup\@sAfterClass + \else + \aftergroup\AfterAtEndOfClass + \fi + \endgroup{#2}% +} +\newcommand*{\AfterAtEndOfClass}[1]{% + \scr@set@load@hook{lateafter}{#1.\@clsextension}} +\newcommand*{\@@AfterClass}[2]{% + \begingroup + \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax + \aftergroup\@sAfterClass + \else + \aftergroup\@AfterClass + \fi + \endgroup{#2}% +} \newcommand*{\@AfterClass}[1]{% \scr@set@load@hook{after}{#1.\@clsextension}} \newcommand*{\@sAfterClass}[1]{% @@ -142,7 +167,31 @@ \newcommand*{\BeforePackage}[1]{% \scr@set@load@hook{before}{#1.\@pkgextension}} \newcommand*{\AfterPackage}{% - \@ifstar {\@sAfterPackage}{\@AfterPackage}} + \@ifstar {\@sAfterPackage}{% + \@ifnextchar +\@@AfterPackage{% + \@ifnextchar !\@@@AfterPackage\@AfterPackage + }% + }% +} +\newcommand*{\@@@AfterPackage}[2]{% + \begingroup\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax + \aftergroup\@sAfterPackage + \else + \aftergroup\AfterAtEndOfPackage + \fi + \endgroup{#2}% +} +\newcommand*{\AfterAtEndOfPackage}[1]{% + \scr@set@load@hook{lateafter}{#1.\@pkgextension}} +\newcommand*{\@@AfterPackage}[2]{% + \begingroup + \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax + \aftergroup\@sAfterPackage + \else + \aftergroup\@AfterPackage + \fi + \endgroup{#2}% +} \newcommand*{\@AfterPackage}[1]{% \scr@set@load@hook{after}{#1.\@pkgextension}} \newcommand*{\@sAfterPackage}[1]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 0858fdff444..df5aec63777 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -94,7 +94,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -174,6 +174,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -774,15 +776,29 @@ \expandafter\in@@#1#2\in@\in@@ } \newif\if@refwide +\newcommand*{\@datepos}{1} \KOMA@key{refline}[wide]{% \begingroup - \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1}}{#1}% + \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1},% + {dateleft}{2},{leftdate}{2},% + {dateright}{3},{rightdate}{3},% + {nodate}{4}% + }{#1}% \ifcase\@tempa \endgroup \@refwidetrue - \else + \or \endgroup \@refwidefalse + \or + \endgroup + \def\@datepos{2}% + \or + \endgroup + \def\@datepos{1}% + \or + \endgroup + \def\@datepos{0}% \fi } \newcommand{\subject@format}[1]{#1} @@ -1096,7 +1112,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listiv\endcsname \endgroup - \def\@listiv{\leftmargin\leftmarginiv + \edef\@listiv{\leftmargin\leftmarginiv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1105,7 +1121,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listv\endcsname \endgroup - \def\@listv{\leftmargin\leftmarginv + \edef\@listv{\leftmargin\leftmarginv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1114,7 +1130,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listvi\endcsname \endgroup - \def\@listvi{\leftmargin\leftmarginvi + \edef\@listvi{\leftmargin\leftmarginvi \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1465,6 +1481,24 @@ \providecaptionname{austrian}\wwwname{URL}% \providecaptionname{austrian}\bankname{Bankverbindung}% \g@addnumerical@date{austrian}{\number\day.\,\number\month.\,\number\year}% + \providecaptionname{naustrian}\yourrefname{Ihr Zeichen}% + \providecaptionname{naustrian}\yourmailname{Ihr Schreiben vom}% + \providecaptionname{naustrian}\myrefname{Unser Zeichen}% + \providecaptionname{naustrian}\customername{Kundennummer}% + \providecaptionname{naustrian}\invoicename{Rechnungsnummer}% + \providecaptionname{naustrian}\subjectname{Betrifft}% + \providecaptionname{naustrian}\ccname{Kopien an}% + \providecaptionname{naustrian}\enclname{Anlagen}% + \providecaptionname{naustrian}\headtoname{An}% + \providecaptionname{naustrian}\headfromname{Von}% + \providecaptionname{naustrian}\datename{Datum}% + \providecaptionname{naustrian}\pagename{Seite}% + \providecaptionname{naustrian}\phonename{Telefon}% + \providecaptionname{naustrian}\faxname{Fax}% + \providecaptionname{naustrian}\emailname{E-Mail}% + \providecaptionname{naustrian}\wwwname{URL}% + \providecaptionname{naustrian}\bankname{Bankverbindung}% + \g@addnumerical@date{naustrian}{\number\day.\,\number\month.\,\number\year}% \providecaptionname{french}\yourrefname{Vos r\'ef\'erences}% \providecaptionname{french}\yourmailname{Votre lettre du}% \providecaptionname{french}\myrefname{Nos r\'ef\'erences}% @@ -1653,6 +1687,10 @@ \captionsaustrian \dateaustrian \fi\fi + \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian + \captionsnaustrian + \datenaustrian + \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german \captionsgerman \dategerman @@ -1715,7 +1753,7 @@ used language is `\languagename'.\MessageBreak Supported languages are `english', `UKenglish',\MessageBreak `british', `american', `USenglish',\MessageBreak - `german', `ngerman', `austrian',\MessageBreak + `german', `ngerman', `austrian', `naustrian',\MessageBreak `dutch', `italian', `spanish',\MessageBreak `croatian', `finnish', `norsk'% }% @@ -1803,17 +1841,17 @@ \newcommand*{\@usekomavar}[2][\@firstofone]{% \@ifundefined{scr@#2@var}{% \@komavar@err{use}{#2}% - }{% + }{% #1{\@nameuse{scr@#2@var}}% - }% - } + }% +} \newcommand*{\@usekomaname}[2][\@firstofone]{% \@ifundefined{scr@#2@var}{% \@komavar@err{use}{#2}% - }{% + }{% #1{\@nameuse{scr@#2@name}}% - }% - } + }% +} \DeclareRobustCommand*{\ifkomavar}[1]{% \scr@ifundefinedorrelax{scr@#1@var}{% \expandafter\@secondoftwo @@ -1855,7 +1893,7 @@ \newcommand*{\@newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% - }{% + }{% \ClassError{scrlttr2}{% pseudo-length \expandafter\string\csname ltr@len@#1\endcsname already defined% @@ -3238,6 +3276,7 @@ \vskip-\useplength{locvpos}\move@frompt }% } +\newcommand*{\do@set@reffield}{} \newcommand*{\@set@reffield}[1]{% \ifkomavarempty{#1}{}{% \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}% @@ -3249,9 +3288,14 @@ \@tempswatrue }% } +\newcommand*{\@test@reffield}[1]{% + \ifkomavarempty{#1}{}{% + \@tempswatrue + }% +} \newcommand*{\@set@reffields}{}% \newcommand*{\addtoreffields}[1]{% - \l@addto@macro{\@set@reffields}{\@set@reffield{#1}}% + \l@addto@macro{\@set@reffields}{\do@set@reffield{#1}}% } \newcommand*{\removereffields}{% \renewcommand*{\@set@reffields}{}% @@ -3281,7 +3325,8 @@ \@setplength{refhpos}{\oddsidemargin}% \@addtoplength{refhpos}{1in}% \fi - \else\ifdim\useplength{refhpos}=\z@ + \else + \ifdim\useplength{refhpos}=\z@ \begingroup \setlength\@tempdima{\textwidth}% \addtolengthplength[-]{\@tempdima}{refwidth}% @@ -3301,52 +3346,49 @@ \fi\fi \@tempswafalse \move@topt\vskip\useplength{refvpos}% - \rlap{\noindent\move@topl\hskip\useplength{refhpos}% - \vbox{\hsize\useplength{refwidth}% - \noindent\@set@reffields% - \if@tempswa - \setbox0\hbox{\usekomafont{refname}\strutbox}% - \ifdim\ht0>\ht\strutbox - \ClassWarningNoLine{scrlttr}{% - Font element `refname' should not be larger than - \string\normalsize!}% - \fi - \setbox0\hbox{\usekomafont{refvalue}\strutbox}% - \ifdim\ht0>\ht\strutbox - \ClassWarningNoLine{scrlttr}{% - Font element `refvalue' should not be larger than - \string\normalsize!}% - \fi - \fi - \ifkomavarempty{date}{% - \if@tempswa - \typeout{Reference line(s): with fields but without date}% - \else - \typeout{Reference line(s): no}% - \aftergroup\aftergroup\aftergroup\@tempswatrue + \@tempswafalse + \let\do@set@reffield\@test@reffield + \@set@reffields + \ifcase \@datepos\else\@test@reffield{date}\fi + \if@tempswa + \@tempswafalse + \rlap{\noindent\move@topl\hskip\useplength{refhpos}% + \vbox{\hsize\useplength{refwidth}% + \noindent + \ifnum \@datepos=2 + \@set@reffields + \if@tempswa + \@tempswafalse + \@set@reffield{date}% + \fi \fi - }{% + \let\do@set@reffield\@set@reffield + \@set@reffields% \if@tempswa - \typeout{Reference line(s): with fields and date}% - \settowidth{\@tempdima}{\strut - \usekomafont{refvalue}\usekomavar{date}}% - \setbox0\hbox{\usekomafont{refname}\usekomavar*{date}}% - \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi - \enskip\hfill - \parbox[t]{\@tempdima}{\noindent\raggedright% - \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{date}}% + \ifnum \@datepos=1 \@set@reffield{date}\fi% + \setbox0\hbox{\usekomafont{refname}\strutbox}% + \ifdim\ht0>\ht\strutbox + \ClassWarningNoLine{scrlttr}{% + Font element `refname' should not be larger than + \string\normalsize!}% + \fi + \setbox0\hbox{\usekomafont{refvalue}\strutbox}% + \ifdim\ht0>\ht\strutbox + \ClassWarningNoLine{scrlttr}{% + Font element `refvalue' should not be larger than + \string\normalsize!}% + \fi \else - \typeout{Reference line: only place and date}% - \enskip\hfill - \ifkomavarempty{place}{}{% - \usekomavar{place}\usekomavar{placeseparator}}% - \usekomavar{date}% - \@tempswatrue + \ifcase \@datepos\else + \ifnum \@datepos=1 \enskip\hfill\fi + \ifkomavarempty{place}{}{% + \usekomavar{place}\usekomavar{placeseparator}}% + \usekomavar{date}% + \fi \fi - }% }% }% - \if@tempswa\vskip-\baselineskip\fi + \fi \vskip\useplength{refaftervskip}% }% } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 38c4bd9c997..9ff72bd7063 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/10/01 v3.07a} +\def\tocbasicversion{2011/03/23 v3.09} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -184,6 +184,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -697,31 +699,49 @@ \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: scrkfloa.dtx +\newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse +\newif\if@figurecaptionabove\@figurecaptionabovefalse \newif\ifonelinecaptions\onelinecaptionstrue \newcommand*{\scap@pos}{r} \newcommand*{\scap@valign}{b} \KOMA@key{captions}{% \KOMA@set@ncmdkey{captions}{@tempa}{% - {tableheading}{0},% - {tableabove}{0},{abovetable}{0},{abovetabular}{0},{topattable}{0},% - {tablesignature}{1},% - {tablebelow}{1},{belowtable}{1},{belowtabular}{1},{bottomattable}{1},% - {oneline}{2},% - {nooneline}{3},% - {rightbeside}{4},{besideright}{4},% - {leftbeside}{5},{besideleft}{5},% - {innerbeside}{6},{besideinner}{6},% - {outerbeside}{7},{besideouter}{7},% - {topbeside}{8},{besidetop}{8},% - {centeredbeside}{9},{besidecentered}{9},% - {middlebeside}{9},{besidemiddle}{9},% - {bottombeside}{10},{besidebottom}{10}% + {heading}{0},{above}{0},{top}{0},% + {signature}{1},{below}{1},{bot}{1},{bottom}{1},% + {tableheading}{2},% + {tableabove}{2},{abovetable}{2},{abovetabular}{2},{topattable}{2},% + {tablesignature}{3},% + {tablebelow}{3},{belowtable}{3},{belowtabular}{3},{bottomattable}{3},% + {figureheading}{4},{figureabove}{4},{abovefigure}{4},{topatfigure}{4},% + {figuresignature}{5},{figurebelow}{5},{belowfigure}{5},{bottomatfigure}{5},% + {oneline}{6},% + {nooneline}{7},% + {rightbeside}{8},{besideright}{8},% + {leftbeside}{9},{besideleft}{9},% + {innerbeside}{10},{besideinner}{10},% + {outerbeside}{11},{besideouter}{11},% + {topbeside}{12},{besidetop}{12},% + {centeredbeside}{13},{besidecentered}{13},% + {middlebeside}{13},{besidemiddle}{13},% + {bottombeside}{14},{besidebottom}{14}% }{#1}% \ifcase \@tempa\relax \@tablecaptionabovetrue + \@figurecaptionabovetrue + \@captionabovetrue + \or + \@tablecaptionabovefalse + \@figurecaptionabovefalse + \@captionabovefalse + \or + \@tablecaptionabovetrue \or \@tablecaptionabovefalse + \or + \@figurecaptionabovetrue + \or + \@figurecaptionabovefalse \or \onelinecaptionstrue \or @@ -1271,7 +1291,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listiv\endcsname \endgroup - \def\@listiv{\leftmargin\leftmarginiv + \edef\@listiv{\leftmargin\leftmarginiv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1280,7 +1300,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listv\endcsname \endgroup - \def\@listv{\leftmargin\leftmarginv + \edef\@listv{\leftmargin\leftmarginv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1289,7 +1309,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listvi\endcsname \endgroup - \def\@listvi{\leftmargin\leftmarginvi + \edef\@listvi{\leftmargin\leftmarginvi \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -2567,7 +2587,6 @@ \setlength{\abovecaptionskip}{10\p@} \setlength{\belowcaptionskip}{0\p@} \newcommand*{\captionformat}{:\ } -\newif\if@captionabove\@captionabovefalse \newcommand{\scr@caption}{} \AtBeginDocument{\let\scr@caption\caption} \newcommand{\captionabove}{\@captionabovetrue\scr@caption} @@ -3033,7 +3052,9 @@ \setcounter{dbltopnumber}{2} \renewcommand*\dbltopfraction{.7} \renewcommand*\dblfloatpagefraction{.5} -\newcommand*{\captionof}[1]{\def\@captype{#1}\caption} +\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption} +\newcommand*{\captionaboveof}{\@captionabovetrue\captionof} +\newcommand*{\captionbelowof}{\@captionabovefalse\captionof} \BeforePackage{capt-of}{\let\captionof\relax} \newcommand*\figurename{Figure} \newcommand*\tablename{Table} @@ -3051,11 +3072,15 @@ \newcommand*{\ext@figure}{lof} \newcommand*{\fnum@figure}{\figureformat} \newenvironment{figure}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@float{figure}% }{% \end@float } \newenvironment{figure*}{% + \if@figurecaptionabove\let\caption\captionabove + \else\let\caption\captionbelow\fi \let\caption\captionbelow\@dblfloat{figure}% }{% \end@dblfloat diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 80c02a3e0bf..17ae5f11ab1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 a503ef524f8..333c44f6926 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 2b5f5832be1..1f97731ee81 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 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 1ab08c7b25c..674fcc05614 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index c93fc431187..cb4c3c93e70 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -39,7 +39,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/10/01 v3.07a} +\def\tocbasicversion{2011/03/23 v3.09} \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocbasic} [\tocbasicversion\space KOMA-Script package @@ -230,7 +230,7 @@ \setlength{\parskip}{\z@}% \setlength{\parindent}{\z@}% \setlength{\parfillskip}{\z@\@plus 1fil}% - \def\@currext{#1}% + \edef\@currext{#1}% \csname tocbasic@@before@hook\endcsname \csname tb@#1@before@hook\endcsname \@starttoc{#1}% @@ -283,7 +283,7 @@ }{% \expandafter\let\expandafter\list@fname\csname listof#2name\endcsname }% - \def\@currext{#2}% + \edef\@currext{#2}% \iftocfeature{\@currext}{onecolumn}{% \iftocfeature{\@currext}{leveldown}{}{% \if@twocolumn @@ -495,6 +495,12 @@ \define@key{tocbasic}{floatpos}{% \tb@ifvalueisnotempty{floatpos}{#1}{\edef\tb@nt@floatpos{#1}}% } +\define@key{tocbasic}{atbegin}{% + \tb@ifvalueisnotempty{atbegin}{#1}{\def\tb@nt@atbegin{#1}}% +} +\define@key{tocbasic}{atend}{% + \tb@ifvalueisnotempty{atend}{#1}{\def\tb@nt@atend{#1}}% +} \newcommand*{\DeclareNewTOC}[2][]{% \tb@floatfalse \tb@nonfloatfalse @@ -510,7 +516,9 @@ \def\tb@nt@level{1}% \def\tb@nt@indent{1em}% \def\tb@nt@hang{1.5em}% - \let\tb@nt@counterwithin\@empty% + \let\tb@nt@counterwithin\@empty + \let\tb@nt@atbegin\@empty + \let\tb@nt@atend\@empty \setkeys{tocbasic}{#1}% \expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}% \expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext @@ -553,19 +561,23 @@ \expandafter\newcommand\expandafter*\csname ftype@\tb@nt@type\expandafter \endcsname{\tb@nt@floattype}% \begingroup - \edef\@tempa{% - \noexpand\endgroup - \noexpand\newenvironment{\tb@nt@type}{% - \noexpand\@float{\tb@nt@type}% - }{% - \noexpand\end@float - }% - \noexpand\newenvironment{\tb@nt@type*}{% - \noexpand\@dblfloat{\tb@nt@type}% - }{% - \noexpand\end@dblfloat - }% - }% + \edef\@tempa{% + \noexpand\endgroup + \noexpand\newenvironment{\tb@nt@type}{% + \noexpand\@float{\tb@nt@type}% + \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname + }{% + \noexpand\csname \tb@nt@type @atend\noexpand\endcsname + \noexpand\end@float + }% + \noexpand\newenvironment{\tb@nt@type*}{% + \noexpand\@dblfloat{\tb@nt@type}% + \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname + }{% + \noexpand\csname \tb@nt@type @atend\noexpand\endcsname + \noexpand\end@dblfloat + }% + }% \@tempa \@tempswatrue \fi @@ -577,7 +589,9 @@ \noexpand\trivlist\noexpand\item\noexpand\relax \noexpand\minipage{\noexpand\linewidth}% \noexpand\def\noexpand\@captype{\tb@nt@type}% + \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname }{% + \noexpand\csname \tb@nt@type @atend\noexpand\endcsname \noexpand\endminipage\noexpand\endtrivlist }% }% @@ -617,6 +631,10 @@ }% }% \@tempa + \expandafter\newcommand\expandafter*\csname \tb@nt@type @atbegin\expandafter + \endcsname\expandafter{\tb@nt@atbegin}% + \expandafter\newcommand\expandafter*\csname \tb@nt@type @atend\expandafter + \endcsname\expandafter{\tb@nt@atend}% \fi } \newcommand*{\tb@ifvalueisnotempty}[2]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty index 27a42c24aec..f940ae640b8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty @@ -664,7 +664,8 @@ but there's no TOC style `#2' defined.}% }{% \def\settocfeature{% - \@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}% + \@ifnextchar[ %] + {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}% }% \let\settocstylefeature\settocfeature \expandafter\ifx\csname tocstyle@commandlist@#1\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 5fb111a5524..d260c8e8207 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -68,7 +68,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -625,6 +625,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} %%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 48a148c0ed1..04ab8e94271 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% -- cgit v1.2.3