summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/koma-script/source-doc
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/koma-script/source-doc')
-rw-r--r--macros/latex/contrib/koma-script/source-doc/english/scrbase.tex168
-rw-r--r--macros/latex/contrib/koma-script/source-doc/english/scrbookreportarticle-experts.tex6
-rw-r--r--macros/latex/contrib/koma-script/source-doc/english/scrlfile.tex15
-rw-r--r--macros/latex/contrib/koma-script/source-doc/english/tocbasic.tex46
-rw-r--r--macros/latex/contrib/koma-script/source-doc/english/typearea-experts.tex47
-rw-r--r--macros/latex/contrib/koma-script/source-doc/english/typearea.tex35
-rw-r--r--macros/latex/contrib/koma-script/source-doc/ngerman/scrbase.tex19
-rw-r--r--macros/latex/contrib/koma-script/source-doc/ngerman/scrlfile.tex14
-rw-r--r--macros/latex/contrib/koma-script/source-doc/ngerman/tocbasic.tex24
-rw-r--r--macros/latex/contrib/koma-script/source-doc/ngerman/typearea-experts.tex8
-rw-r--r--macros/latex/contrib/koma-script/source-doc/ngerman/typearea.tex24
11 files changed, 252 insertions, 154 deletions
diff --git a/macros/latex/contrib/koma-script/source-doc/english/scrbase.tex b/macros/latex/contrib/koma-script/source-doc/english/scrbase.tex
index 56f4899802..f457b2af65 100644
--- a/macros/latex/contrib/koma-script/source-doc/english/scrbase.tex
+++ b/macros/latex/contrib/koma-script/source-doc/english/scrbase.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrbase.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrbase.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,11 +46,11 @@
% ======================================================================
\KOMAProvidesFile{scrbase.tex}
- [$Date: 2020-08-24 15:34:10 +0200 (Mon, 24 Aug 2020) $
+ [$Date: 2021-10-16 12:22:12 +0200 (Sat, 16 Oct 2021) $
KOMA-Script package scrbase]
\translator{Markus Kohm\and Melvin Hendrix\and Karl Hagen}
-% Date of the translated German file: 2020-08-24
+% Date of the translated German file: 2021-10-16
\chapter{Basic Functions in the \Package{scrbase} Package}
\labelbase{scrbase}
@@ -983,9 +983,9 @@ replace the functionality. Others have been renamed.
\end{Declaration}
This\ChangedAt{v3.28}{\Package{scrbase}} command works like
\Macro{@ifundefined} from the \LaTeX{} kernel (see \cite{latex:source2e}). So
-the \PName{then code} will be executed if \PName{name} is the name of a
+the \PName{then code} is executed if \PName{name} is the name of a
command that is currently either not defined or \Macro{relax}. Otherwise, the
-\PName{else code} will be executed. Unlike \Macro{@ifundefined}, no hash
+\PName{else code} is executed. Unlike \Macro{@ifundefined}, no hash
memory is allocated nor is \Macro{\PName{Name}} set to \Macro{relax} if
\Macro{\PName{name}} was previously undefined.%
\EndIndexGroup
@@ -995,12 +995,50 @@ memory is allocated nor is \Macro{\PName{Name}} set to \Macro{relax} if
\Parameter{then code}\Parameter{else code}
\end{Declaration}
If\ChangedAt{v3.28}{\Package{scrbase}} the command with the given name has
-already been defined, the \PName{then code} will be executed. Otherwise, the
-\PName{else code} will be executed. Since \eTeX{} already has a primitive
+already been defined, the \PName{then code} is executed. Otherwise, the
+\PName{else code} is executed. Since \eTeX{} already has a primitive
\Macro{ifdefined}, this somewhat unwieldy name, unfortunately, had to be
chosen. There is no corresponding internal command.%
\EndIndexGroup
+
+\begin{Declaration}
+ \Macro{Ifstr}\Parameter{string 1}\Parameter{string 2}%
+ \Parameter{then code}\Parameter{else code}
+\end{Declaration}
+Both\ChangedAt{v3.28}{\Package{scrbase}} \PName{string} arguments are expanded
+and then compared. If the expansions are the same, the \PName{then code} is
+executed. Otherwise the \PName{else code} is executed. There is no
+corresponding internal command.
+%
+\EndIndexGroup
+
+
+\begin{Declaration}
+ \Macro{Ifstrstart}\Parameter{string 1}\Parameter{string 2}%
+ \Parameter{then code}\Parameter{else code}
+\end{Declaration}
+Both\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
+\PName{string} arguments are expanded and then compared. If \PName{string 1},
+apart from white space, begins with \PName{string 2}, the \PName{then code} is
+executed. Otherwise, the \PName{else code} is executed. There is no
+corresponding internal command.%
+\EndIndexGroup
+
+
+\begin{Declaration}
+ \Macro{IfArgIsEmpty}\Parameter{argument}
+ \Parameter{then code}\Parameter{else code}
+\end{Declaration}
+If\ChangedAt{v3.19}{\Package{scrbase}} the \PName{argument} is empty, the
+\PName{then code} is executed, otherwise the \PName{else code} is
+executed. Even one whitespace character is considered non-empty. Since the
+\PName{argument} is not expanded, macros that expand to an empty result are
+also considered to be a non-empty \PName{argument}. The same applies to
+\Macro{relax} or undefined macros.%
+\EndIndexGroup
+
+
\iffalse % internal
\begin{Declaration}
\Macro{scr@ifluatex}
@@ -1018,6 +1056,7 @@ There\textnote{Attention!} is no user equivalent for this instruction. Use the
\EndIndexGroup
\fi
+
\iffalse% It makes no sense to document this instruction yet
\begin{Declaration}
\Macro{scr@ifpdforluatex}
@@ -1050,19 +1089,20 @@ test directly for the command you want instead.%
\Macro{scr@ifVTeX}%
\Parameter{then code}\Parameter{else code}%
\end{Declaration}
-If you use V\TeX{}, the \PName{then code} will be executed. Otherwise, the
-\PName{else code} will be executed. This test is seldom useful. As a rule,
+If you use V\TeX{}, the \PName{then code} is executed. Otherwise, the
+\PName{else code} is executed. This test is seldom useful. As a rule,
you should test directly for the command you want instead.%
%
\EndIndexGroup
\fi
+
\begin{Declaration}
\Macro{Ifpdfoutput}%
\Parameter{then code}\Parameter{else code}
\end{Declaration}
If\ChangedAt{v3.28}{\Package{scrbase}} a PDF file is generated, the
-\PName{then code} will be executed. Otherwise, the \PName{else code} will be
+\PName{then code} is executed. Otherwise, the \PName{else code} is
executed. It does not matter whether PDF file is created using lua\TeX{},
pdf\TeX{}, or V\TeX{}, or \XeTeX{}.%
\EndIndexGroup
@@ -1073,7 +1113,7 @@ pdf\TeX{}, or V\TeX{}, or \XeTeX{}.%
\Parameter{then code}\Parameter{else code}
\end{Declaration}
If\ChangedAt{v3.28}{\Package{scrbase}} a PostScript file is generated, the
-\PName{then code} will be executed. Otherwise, the \PName{else code} will be
+\PName{then code} is executed. Otherwise, the \PName{else code} is
executed. V\TeX{} can generate PostScript directly, which is recognized
here. However, if V\TeX{} is not used but the switch \Macro{if@dvips} has been
defined, the decision depends on that switch. \KOMAScript{} provides
@@ -1089,59 +1129,20 @@ defined, the decision depends on that switch. \KOMAScript{} provides
\Parameter{then code}\Parameter{else code}
\end{Declaration}
If\ChangedAt{v3.28}{\Package{scrbase}} a DVI-file is generated, the
-\PName{then code} will be executed. Otherwise, the \PName{else code} will be
+\PName{then code} is executed. Otherwise, the \PName{else code} is
executed. A DVI file is always assumed to be generated if no direct output of
a PDF file or a PostScript file can be detected.%
\EndIndexGroup
\begin{Declaration}
- \Macro{if@atdocument}\ \PName{then code}\ %
- \textMacro{else}\ \PName{else code}\ \textMacro{fi}
-\end{Declaration}
-This conditional command intentionally exists only as an internal command. In
-the document preamble, \Macro{if@atdocument} corresponds to \Macro{iffalse}.
-After \Macro{begin}\PParameter{document}, it corresponds to \Macro{iftrue}.
-Authors of classes and packages may find this command useful if a command
-should behave differently depending on whether it is used in the preamble or
-inside document body. Note\textnote{Attention!} that this command is a
-condition using \TeX{} syntax and not \LaTeX{} syntax!
-%
-\EndIndexGroup
-
-
-\begin{Declaration}
- \Macro{Ifstr}\Parameter{string 1}\Parameter{string 2}%
- \Parameter{then code}\Parameter{else code}
-\end{Declaration}
-Both\ChangedAt{v3.28}{\Package{scrbase}} \PName{string} arguments are expanded
-and then compared. If the expansions are the same, the \PName{then code} will
-be executed. Otherwise the \PName{else code} will be executed. There is no
-corresponding internal command.
-%
-\EndIndexGroup
-
-
-\begin{Declaration}
- \Macro{Ifstrstart}\Parameter{string 1}\Parameter{string 2}%
- \Parameter{then code}\Parameter{else code}
-\end{Declaration}
-Both\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
-\PName{string} arguments are expanded and then compared. If \PName{string 1},
-apart from white space, begins with \PName{string 2}, the \PName{then code}
-will be executed. Otherwise, the \PName{else code} will be executed. There is
-no corresponding internal command.%
-\EndIndexGroup
-
-
-\begin{Declaration}
\Macro{Ifisdimen}\Parameter{expression}%
\Parameter{then code}\Parameter{else code}
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to a \Macro{dimen}, i.\,e. a \TeX{} length
-register, the \PName{then code} will be executed. Otherwise the \PName{else
- code} will be executed. The command is not completely expandable, and there
+register, the \PName{then code} is executed. Otherwise the \PName{else
+ code} is executed. The command is not completely expandable, and there
is no corresponding internal command.%
\EndIndexGroup
@@ -1152,8 +1153,8 @@ is no corresponding internal command.%
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to something syntactically equivalent to a length,
-the \PName{then code} will be executed. Otherwise the \PName{else code} will
-be executed. Note\textnote{Attention!} that unknown units will cause an error
+the \PName{then code} is executed. Otherwise the \PName{else code} is
+executed. Note\textnote{Attention!} that unknown units cause an error
message. The command is not completely expandable, and there is no
corresponding internal command.%
\EndIndexGroup
@@ -1163,9 +1164,9 @@ corresponding internal command.%
\Macro{Ifdimen}\Parameter{string}%
\Parameter{then code}\Parameter{else code}
\end{Declaration}
-The \PName{then code}\ChangedAt{v3.28}{\Package{scrbase}} will be executed if
+The \PName{then code}\ChangedAt{v3.28}{\Package{scrbase}} is executed if
the first-order expansion of \PName{string} consists of digits and a valid
-length unit. Otherwise, the \PName{else code} will be used. There is no
+length unit. Otherwise, the \PName{else code} is used. There is no
corresponding internal command.%
\EndIndexGroup
@@ -1176,9 +1177,9 @@ corresponding internal command.%
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to an \eTeX{} \Macro{dimexpr}\IndexCmd{dimexpr},
-the \PName{then code} will be executed. Otherwise, the \PName{else code} will
-be executed. Note\textnote{Attention!} that illegal expressions will result
-in error messages. The command is not completely expandable, and there is no
+the \PName{then code} is executed. Otherwise, the \PName{else code} is
+executed. Note\textnote{Attention!} that illegal expressions result in
+error messages. The command is not completely expandable, and there is no
corresponding internal command.%
\EndIndexGroup
@@ -1189,7 +1190,7 @@ corresponding internal command.%
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to a \Macro{skip}, i.\,e. a \TeX{} distance, the
-\PName{then code} will be executed. Otherwise, the \PName{else code} will be
+\PName{then code} is executed. Otherwise, the \PName{else code} is
executed. The command is not completely expandable, and there is no
corresponding internal command.%
\EndIndexGroup
@@ -1201,8 +1202,8 @@ corresponding internal command.%
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to something syntactically equivalent of the value
-of a skip, the \PName{then code} will be executed. Otherwise, the \PName{else
- code} will be executed. Note\textnote{Attention!} that invalid units will
+of a skip, the \PName{then code} is executed. Otherwise, the \PName{else
+ code} is executed. Note\textnote{Attention!} that invalid units
result in an error message. The command is not completely expandable, and
there is no corresponding internal command.%
\EndIndexGroup
@@ -1214,9 +1215,9 @@ there is no corresponding internal command.%
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to a \Macro{glueexpr}, i.\,e. an \eTeX{} distance
-expression, the \PName{then code} will be executed. Otherwise, the \PName{else
- code} will be executed. Note,\textnote{Attention!} that illegal expressions
-will result in error messages. The command is not completely expandable, and
+expression, the \PName{then code} is executed. Otherwise, the \PName{else
+ code} is executed. Note,\textnote{Attention!} that illegal expressions
+result in error messages. The command is not completely expandable, and
there is no corresponding internal command.%
\EndIndexGroup
@@ -1226,8 +1227,8 @@ there is no corresponding internal command.%
\Parameter{then code}\Parameter{else code}
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
-\PName{counter} is defined as a \LaTeX{} counter, the \PName{then code} will
-be executed. Otherwise, the \PName{else code} will be executed. The command is
+\PName{counter} is defined as a \LaTeX{} counter, the \PName{then code} is
+executed. Otherwise, the \PName{else code} is executed. The command is
not completely expandable, and there is no corresponding internal command.%
\EndIndexGroup
@@ -1238,7 +1239,7 @@ not completely expandable, and there is no corresponding internal command.%
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{count} expands to a \Macro{count}, i.\,e. a \TeX{} counter, the
-\PName{then code} will be executed. Otherwise, the \PName{else code} will be
+\PName{then code} is executed. Otherwise, the \PName{else code} is
executed. The command is not completely expandable, and there is no
corresponding internal command. For tests of \LaTeX{} counters, see
\DescRef{\LabelBase.cmd.Ifiscounter}.%
@@ -1252,7 +1253,7 @@ corresponding internal command. For tests of \LaTeX{} counters, see
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to something syntactically equivalent to of the
value of a counter, i.\,e. a negative or positive integer, the \PName{then
- code} will be executed. Otherwise, the \PName{else code} will be
+ code} is executed. Otherwise, the \PName{else code} is
executed. The command is not completely expandable, and there is no
corresponding internal command.%
\EndIndexGroup
@@ -1262,9 +1263,9 @@ corresponding internal command.%
\Macro{Ifnumber}\Parameter{string}%
\Parameter{then code}\Parameter{else code}
\end{Declaration}
-The\ChangedAt{v3.28}{\Package{scrbase}} \PName{then code} will be executed if
+The\ChangedAt{v3.28}{\Package{scrbase}} \PName{then code} is executed if
the first-order expansion of \PName{string} consists only of
-digits. Otherwise, the \PName{else code} will be used. There is no
+digits. Otherwise, the \PName{else code} is used. There is no
corresponding internal command.
%
\EndIndexGroup
@@ -1276,9 +1277,9 @@ corresponding internal command.
\end{Declaration}
If\ChangedAt{v3.12}{\Package{scrbase}}\ChangedAt{v3.28}{\Package{scrbase}}
\PName{expression} expands to a \Macro{numexpr}, i.\,e. an \eTeX{} number
-expression, the \PName{then code} will be executed. Otherwise, the \PName{else
- code} will be executed. Note\textnote{Attention!} that illegal expressions
-will result in error messages. The command is not completely expandable, and
+expression, the \PName{then code} is executed. Otherwise, the \PName{else
+ code} is executed. Note\textnote{Attention!} that illegal expressions
+result in error messages. The command is not completely expandable, and
there is no corresponding internal command.%
\EndIndexGroup
@@ -1344,6 +1345,21 @@ would be to use \DescRef{scrlayer.cmd.@mkright} from package
\EndIndexGroup
+\begin{Declaration}
+ \Macro{if@atdocument}\ \PName{then code}\ %
+ \textMacro{else}\ \PName{else code}\ \textMacro{fi}
+\end{Declaration}
+This conditional command intentionally exists only as an internal command. In
+the document preamble, \Macro{if@atdocument} corresponds to \Macro{iffalse}.
+After \Macro{begin}\PParameter{document}, it corresponds to \Macro{iftrue}.
+Authors of classes and packages may find this command useful if a command
+should behave differently depending on whether it is used in the preamble or
+inside document body. Note\textnote{Attention!} that this command is a
+condition using \TeX{} syntax and not \LaTeX{} syntax!
+%
+\EndIndexGroup
+
+
\section{Defining Language-Dependent Terms}
\seclabel{languageSupport}
\BeginIndexGroup
diff --git a/macros/latex/contrib/koma-script/source-doc/english/scrbookreportarticle-experts.tex b/macros/latex/contrib/koma-script/source-doc/english/scrbookreportarticle-experts.tex
index 18638fc967..93188d4de2 100644
--- a/macros/latex/contrib/koma-script/source-doc/english/scrbookreportarticle-experts.tex
+++ b/macros/latex/contrib/koma-script/source-doc/english/scrbookreportarticle-experts.tex
@@ -48,7 +48,7 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-experts.tex}
- [$Date: 2021-06-25 10:07:54 +0200 (Fri, 25 Jun 2021) $
+ [$Date: 2021-10-15 12:26:30 +0200 (Fri, 15 Oct 2021) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for
experts)]
@@ -1502,7 +1502,7 @@ different levels. The predefined commands \DescRef{maincls.cmd.chapter},
\end{Declaration}
These\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and
\Class{scrartcl}} commands are used by headings with the \PValue{section}
-style depending on whether the reading is run-in or on its own line.
+style depending on whether the heading is run-in or on its own line.
Free-standing headings use \Macro{sectionlinesformat} for their output, while
run-in headings use \Macro{sectioncatchphraseformat}.
@@ -1636,7 +1636,7 @@ these hooks are not available for it.%
Strictly\ChangedAt{v3.27}{\Class{scrbook}\and \Class{scrreprt}\and
\Class{scrartcl}} speaking, this is an internal command. It is defined
inside sectioning commands only between the \DoHook{\dots/begingroup/\dots}
-and \DoHook{\dots/endroup/\dots} hooks. In this case, the
+and \DoHook{\dots/endgroup/\dots} hooks. In this case, the
\Parameter{then code} is executed if the sectioning heading uses the non-star
variant and should be numbered according to the value of
\DescRef{maincls.counter.secnumdepth}. If the heading should not be numbered
diff --git a/macros/latex/contrib/koma-script/source-doc/english/scrlfile.tex b/macros/latex/contrib/koma-script/source-doc/english/scrlfile.tex
index f6a7220ca8..b51bc090cc 100644
--- a/macros/latex/contrib/koma-script/source-doc/english/scrlfile.tex
+++ b/macros/latex/contrib/koma-script/source-doc/english/scrlfile.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrlfile.tex
-% Copyright (c) Markus Kohm, 2001-2020
+% Copyright (c) Markus Kohm, 2001-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrlfile.tex
-% Copyright (c) Markus Kohm, 2001-2020
+% Copyright (c) Markus Kohm, 2001-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,11 +46,11 @@
% ============================================================================
\KOMAProvidesFile{scrlfile.tex}
- [$Date: 2020-09-14 09:43:36 +0200 (Mon, 14 Sep 2020) $
+ [$Date: 2021-11-01 13:25:07 +0100 (Mon, 01 Nov 2021) $
KOMA-Script guide (chapter: scrlfile)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Karl Hagen}
-% Date of the translated German file: 2020-09-14
+% Date of the translated German file: 2021-11-01
\chapter{Controlling Package Dependencies with \Package{scrlfile}}
\labelbase{scrlfile}
@@ -119,7 +119,10 @@ hook mechanism is available. Instead of redefining macros of the \LaTeX{}
kernel, \Package{scrlfile} 3.32 and newer makes use of it. For this purpose it
loads the internal package
\Package{scrfile-hook}\IndexPackage[indexmain]{scrlfile-hook}. With older
-\LaTeX{} versions, the internal package \Package{scrlayer-patcholdkernel}%
+\LaTeX{} versions, depending\ChangedAt{v3.35}{\Package{scrlfile}} on the
+kernel version, either the internal package
+\Package{scrlayer-hook-3.34}\IndexPackage[indexmain]{scrlfile-hook-3.34} or
+\Package{scrlayer-patcholdkernel}%
\IndexPackage[indexmain]{scrlfile-patcholdkernel} is used. However, since it
was not possible to achieve identical functionality with the new mechanism in
\LaTeX, some commands of \Package{scrlfile} were marked as
@@ -134,7 +137,7 @@ before loading the class. \Package{scrlfile} then additionally emulates some
of the deprecated commands in a way that should be sufficient in most
cases. In any case, the author of the corresponding class or package should be
informed, so that he or she can make an adaptation to the current version of
-\Package{scrlfile} or directly to \LaTeX{} from version 2020-10-01.%
+\Package{scrlfile} or directly to \LaTeX{} from version 2021-11-15.%
%
\EndIndexGroup
diff --git a/macros/latex/contrib/koma-script/source-doc/english/tocbasic.tex b/macros/latex/contrib/koma-script/source-doc/english/tocbasic.tex
index 816c890859..2f4d6a4d19 100644
--- a/macros/latex/contrib/koma-script/source-doc/english/tocbasic.tex
+++ b/macros/latex/contrib/koma-script/source-doc/english/tocbasic.tex
@@ -1,6 +1,6 @@
% ======================================================================
% tocbasic.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% tocbasic.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,10 +46,10 @@
% ======================================================================
\KOMAProvidesFile{tocbasic.tex}
- [$Date: 2020-06-11 16:57:03 +0200 (Thu, 11 Jun 2020) $
+ [$Date: 2021-10-15 13:47:06 +0200 (Fri, 15 Oct 2021) $
KOMA-Script guide (package tocbasic)]
-% Date of the translated German file: 2020-06-11
+% Date of the translated German file: 2021-10-15
\translator{Markus Kohm\and Arndt Schubert\and Karl Hagen}
@@ -2344,9 +2344,21 @@ the styles.%
\entry{\OptionVName{counterwithin}{\LaTeX{} counter}}{%
If you define a new floating or non-floating environment, a new counter
\Counter{\PName{type}} will be created as well (see option
- \Option{type}). You can make this counter depenent another \LaTeX{}
- counter in the same way, for example, that the \Counter{figure} counter in
- the \Class{book} classes is dependent on the \Counter{chapter} counter.%
+ \Option{type}). You can make this counter dependent on another
+ \PName{\LaTeX{} counter} in the same way, for example, that the
+ \Counter{figure} counter in the \Class{book} classes is dependent on the
+ \Counter{chapter} counter. A\ChangedAt{v3.35}{\Package{tocbasic}} setting
+ \OptionValue{counterwithin}{chapter} is used for classes with
+ \DescRef{maincls.cmd.chapter}\IndexCmd{chapter} only in the main matter
+ (see \DescRef{maincls.cmd.frontmatter}\IndexCmd{frontmatter},
+ \DescRef{maincls.cmd.mainmatter} and
+ \DescRef{maincls.cmd.backmatter}\IndexCmd{backmatter} in
+ \autoref{sec:maincls.separation}, \DescPageRef{maincls.cmd.frontmatter})
+ and only if the counter \Counter{chapter}\IndexCounter{chapter} is greater
+ than zero at output. For classes without \DescRef{maincls.cmd.chapter}
+ this applies accordingly to the \OptionValue{counterwithin}{section}
+ setting and counter
+ \Counter{section}\IndexCounter{section}\IndexCmd{section}.%
}%
\entry{\Option{float}}{%
If set, defines a new content list and a floating environment, both named
@@ -2358,7 +2370,7 @@ the styles.%
changed through the optional argument of the floating environment. The
syntax and semantics are identical to those of the standard floating
environments. If the option is not used, the default \PName{float
- positions} are ``\texttt{tbp}'', that is \emph{top}, \emph{bottom},
+ positions} are ``\texttt{tbp}'', that is \emph{top}, \emph{bottom},
\emph{page}.%
}%
\entry{\OptionVName{floattype}{number}}{%
@@ -2379,7 +2391,7 @@ the styles.%
\ChangedAt{v3.21}{\Package{tocbasic}}%
This option has been deprecated since \KOMAScript~3.20. Instead, the
amount of the hanging indent of entries to the content list\index{content
- list>entry} depends on attributes of the TOC-entry style given by the
+ list>entry} depends on attributes of the TOC-entry style given by the
\Option{tocentrystyle} option. The \KOMAScript{} styles provide the
\PValue{numwidth} attribute. If the style used has such an attribute,
\Macro{DeclareNewTOC} will initialise it with a default of 1.5\Unit{em}.
@@ -2426,15 +2438,15 @@ the styles.%
the content list. If no \PName{entry name} is given, the value of the
\PValue{type} (see the \Option{type} option) with the first character
changed to upper case will be used. It also defines a \Macro{\PName{entry
- type}name} macro with this value, which you can change at any time. This
- macro, however, is only defined if it is not already defined or if the
- \Option{forcenames} option is also set.%
+ type}name} macro with this value, which you can change at any
+ time. This macro, however, is only defined if it is not already defined or
+ if the \Option{forcenames} option is also set.%
}%
\entry{\Option{nonfloat}}{%
- If set, defines not only a content list but also a non-floating environment,
- \Environment{\PName{entry type}-} (see the \Option{type} option), which can
- be used similarly to a floating environment, but which does not move from
- the place where it is used.%
+ If set, defines not only a content list but also a non-floating
+ environment, \Environment{\PName{entry type}-} (see the \Option{type}
+ option), which can be used similarly to a floating environment, but which
+ does not move from the place where it is used.%
}%
\entry{\OptionVName{owner}{string}}{%
Every new content list has an owner in \Package{tocbasic} (see
@@ -2455,7 +2467,7 @@ the styles.%
entries to the content list corresponding to the \PName{extension}. The
name of the entry level is given by the \Option{type} option. In addition
to the options in this table, all attributes of the \PName{TOC-entry
- style} can be used as options. To do so, you have to prefix the name of
+ style} can be used as options. To do so, you have to prefix the name of
such an attribute with \PValue{tocentry}. For example, you can change the
numerical level of the entries using the \Option{tocentrylevel} option.
For more information about the styles and their attributes see
diff --git a/macros/latex/contrib/koma-script/source-doc/english/typearea-experts.tex b/macros/latex/contrib/koma-script/source-doc/english/typearea-experts.tex
index 9444ae4f43..093b3f7a74 100644
--- a/macros/latex/contrib/koma-script/source-doc/english/typearea-experts.tex
+++ b/macros/latex/contrib/koma-script/source-doc/english/typearea-experts.tex
@@ -1,6 +1,6 @@
% ======================================================================
% typearea-experts.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% typearea-experts.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,11 +46,11 @@
% ======================================================================
\KOMAProvidesFile{typearea-experts.tex}
- [$Date: 2019-11-29 10:10:16 +0100 (Fri, 29 Nov 2019) $
+ [$Date: 2021-11-09 09:58:01 +0100 (Tue, 09 Nov 2021) $
KOMA-Script guide (chapter: typearea)]
\translator{Markus Kohm\and Gernot Hassenpflug\and Karl Hagen}
-% Date of the translated German file: 2019-11-29
+% Date of the translated German file: 2021-07-11
\chapter{Additional Information about the \Package{typearea} package}
\labelbase{typearea-experts}
@@ -171,27 +171,48 @@ restore all current type-area settings. So you can save the current settings,
change them, and then restore the previous settings afterwards.
\begin{Example}
- You want a landscape page inside a document with portrait format. That's
- no problem using \Macro{storeareas}:
+ Time and again, users ask about the possibility of inserting an A3 page in
+ landscape format in an A4 document while retaining the margin settings. The
+ text area should therefore only be widened by the extra paper width. With
+ \Macro{storeareas}, \DescRef{\LabelBase.cmd.areaset} and the previously
+ explained option \DescRef{\LabelBase.option.areasetadvanced} this is very
+ easily possible:
+
\begin{lstcode}
- \documentclass[pagesize]{scrartcl}
+ \documentclass[areasetadvanced]{scrartcl}
+ \areaset[current]{\textwidth}{\textheight}
\begin{document}
\noindent\rule{\textwidth}{\textheight}
- \storeareas\MySavedValues
- \KOMAoptions{paper=landscape,DIV=current}
+ \storeareas\MySavedTypingArea
+ \KOMAoption{paper}{a3,landscape}
+ \areaset[current]
+ {\dimexpr\textwidth+.5\paperwidth\relax}
+ {\textheight}
\noindent\rule{\textwidth}{\textheight}
\clearpage
- \MySavedValues
+ \MySavedTypingArea
\noindent\rule{\textwidth}{\textheight}
\end{document}
\end{lstcode}
+ The \DescRef{\LabelBase.cmd.areaset} command\IndexCmd{areaset} in the
+ document preamble is used together with the
+ \DescRef{\LabelBase.option.areasetadvanced}\IndexOption{areasetadvanced}
+ option to compensate for the differences between the
+ \DescRef{typearea.cmd.typearea} preset and the later use of
+ \DescRef{\LabelBase.cmd.areaset}, as already explained on
+ \DescPageRef{\LabelBase.option.areasetadvanced}. Without this, there could
+ be significant differences in margin settings, especially when using options
+ like \DescRef{typearea.option.headinclude} and
+ \DescRef{typearea.option.headheight}.
+
It's\textnote{Attention} important to call \DescRef{maincls.cmd.clearpage}
- before \Macro{MySavedValues} so that the saved values are restored on the
- next page. With two-sided documents, changes to the paper format should even
- use \DescRef{maincls.cmd.cleardoubleoddpage}\IndexCmd{cleardoubleoddpage}
+ before \Macro{MySavedTypingArea} so that the saved values are restored on
+ the next page. With two-sided documents, changes to the paper format should
+ even use
+ \DescRef{maincls.cmd.cleardoubleoddpage}\IndexCmd{cleardoubleoddpage}
or\,---\,if you are not using a \KOMAScript{}
class\,---\,\DescRef{maincls.cmd.cleardoublepage}%
\IndexCmd{cleardoublepage}.%
diff --git a/macros/latex/contrib/koma-script/source-doc/english/typearea.tex b/macros/latex/contrib/koma-script/source-doc/english/typearea.tex
index 5547cc81d7..616ae28d39 100644
--- a/macros/latex/contrib/koma-script/source-doc/english/typearea.tex
+++ b/macros/latex/contrib/koma-script/source-doc/english/typearea.tex
@@ -1,6 +1,6 @@
% ======================================================================
% typearea.tex
-% Copyright (c) Markus Kohm, 2001-2020
+% Copyright (c) Markus Kohm, 2001-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% typearea.tex
-% Copyright (c) Markus Kohm, 2001-2020
+% Copyright (c) Markus Kohm, 2001-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,12 +46,12 @@
% ======================================================================
\KOMAProvidesFile{typearea.tex}%
- [$Date: 2020-05-09 16:41:52 +0200 (Sat, 09 May 2020) $
+ [$Date: 2021-11-09 09:33:36 +0100 (Tue, 09 Nov 2021) $
KOMA-Script guide (chapter: typearea)]
\translator{Markus Kohm\and Gernot Hassenpflug\and Krickette Murabayashi\and
Karl Hagen}
-% Date of the translated German file: 2019-10-18
+% Date of the translated German file: 2021-11-09
\chapter{Calculating the Page Layout with \Package{typearea}}
\labelbase{typearea}
@@ -681,19 +681,20 @@ with a font package.
The difficulty with doing so is that the {\KOMAScript} class already loads
the \Package{typearea} package itself. Thus, it is not possible to pass
options as optional arguments to \DescRef{\LabelBase.cmd.usepackage}. It
- would also be pointless to specify the \OptionValueRef{\LabelBase}{DIV}{calc}
- option as an optional argument to \DescRef{\LabelBase.cmd.documentclass}.
- This option would be evaluated immediately on loading the \Package{typearea}
- package and as a result the type area and margins would be calculated for the
- standard {\LaTeX} font and not for the font loaded later.
+ would also be pointless to specify the
+ \OptionValueRef{\LabelBase}{DIV}{calc} option as an optional argument to
+ \DescRef{\LabelBase.cmd.documentclass}. This option would be evaluated
+ immediately on loading the \Package{typearea} package and as a result the
+ type area and margins would be calculated for the standard {\LaTeX} font and
+ not for the font loaded later.
However, it is possible to recalculate the type area and margins after
loading the font with the aid of \DescRef{\LabelBase.cmd.KOMAoptions}%
\PParameter{\OptionValueRef{\LabelBase}{DIV}{calc}} or
\DescRef{\LabelBase.cmd.KOMAoption}%
\PParameter{\DescRef{\LabelBase.option.DIV}}\PParameter{calc}. The option
- \OptionValue{DIV}{calc} will then request a \Option{DIV} value for an appropriate line
- length.
+ \OptionValue{DIV}{calc} will then request a \Option{DIV} value for an
+ appropriate line length.
As it is often more convenient to set the \Option{DIV} option not after
loading the font but at a more noticeable point, such as when loading the
@@ -713,6 +714,13 @@ The option \OptionVName{DIV}{last}\ChangedAt{v3.00}{\Package{typearea}} will
recalculate the type area and margins using exactly the same settings as the
last calculation.
+By the way, if the last typeset area calculation before using
+\OptionValue{DIV}{last} or \OptionValue{DIV}{current} was done using
+\DescRef{\LabelBase.cmd.areaset}\IndexCmd{areaset}, the recalculation will be
+done using \DescRef{\LabelBase.cmd.areaset} again. It then corresponds to
+\DescRef{\LabelBase.cmd.areaset}\POParameter{current}\IndexLength{textwidth}%
+\PParameter{\Length{textwidth}}{\Length{textheight}}\IndexLength{textheight}.
+
\begin{Example}
Let's suppose again that we need to calculate an appropriate line length for
a type area using the Bookman font. At the same time, a {\KOMAScript} class
@@ -723,8 +731,9 @@ last calculation.
\usepackage{bookman}
\KOMAoptions{DIV=last}
\end{lstcode}
-If you decide later that you need a different \Option{DIV} value, just change the
-setting of the optional argument to \DescRef{\LabelBase.cmd.documentclass}.
+ If you decide later that you need a different \Option{DIV} value, just
+ change the setting of the optional argument to
+ \DescRef{\LabelBase.cmd.documentclass}.
\end{Example}
For a summary of all possible symbolic values for the \Option{DIV} option, see
diff --git a/macros/latex/contrib/koma-script/source-doc/ngerman/scrbase.tex b/macros/latex/contrib/koma-script/source-doc/ngerman/scrbase.tex
index e287d4f38c..f95f6bbf5b 100644
--- a/macros/latex/contrib/koma-script/source-doc/ngerman/scrbase.tex
+++ b/macros/latex/contrib/koma-script/source-doc/ngerman/scrbase.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrbase.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrbase.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{scrbase.tex}
- [$Date: 2020-08-24 15:34:10 +0200 (Mon, 24 Aug 2020) $
+ [$Date: 2021-10-16 12:22:12 +0200 (Sat, 16 Oct 2021) $
KOMA-Script package scrbase]
\chapter{Grundlegende Funktionen im Paket \Package{scrbase}}
@@ -1174,6 +1174,19 @@ der \PName{Sonst-Teil}.%
\begin{Declaration}
+ \Macro{IfArgIsEmpty}\Parameter{Argument}%
+ \Parameter{Dann-Teil}\Parameter{Sonst-Teil}
+\end{Declaration}
+Ist\ChangedAt{v3.19}{\Package{scrbase}} das \PName{Argument} leer, so wird der
+\PName{Dann-Teil} ausgeführt, anderenfalls der \PName{Sonst-Teil}. Bereits ein
+Leerzeichen gilt als nicht leer. Da das \PName{Argument} nicht expandiert
+wird, gelten Makros, die zu einem leeren Ergebnis expandieren, ebenfalls als
+nicht leeres \PName{Argument}. Dasselbe gilt für \Macro{relax} oder nicht
+definierte Makros.%
+\EndIndexGroup
+
+
+\begin{Declaration}
\Macro{Ifpdfoutput}
\Parameter{Dann-Teil}\Parameter{Sonst-Teil}
\end{Declaration}
diff --git a/macros/latex/contrib/koma-script/source-doc/ngerman/scrlfile.tex b/macros/latex/contrib/koma-script/source-doc/ngerman/scrlfile.tex
index a65ab2312f..2cf55bc73d 100644
--- a/macros/latex/contrib/koma-script/source-doc/ngerman/scrlfile.tex
+++ b/macros/latex/contrib/koma-script/source-doc/ngerman/scrlfile.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrlfile.tex
-% Copyright (c) Markus Kohm, 2001-2020
+% Copyright (c) Markus Kohm, 2001-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrlfile.tex
-% Copyright (c) Markus Kohm, 2001-2020
+% Copyright (c) Markus Kohm, 2001-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,7 +46,7 @@
% ============================================================================
\KOMAProvidesFile{scrlfile.tex}%
- [$Date: 2020-09-14 09:43:36 +0200 (Mon, 14 Sep 2020) $
+ [$Date: 2021-11-01 12:28:35 +0100 (Mon, 01 Nov 2021) $
KOMA-Script guide (chapter: scrlfile)]
\chapter{Paketabhängigkeiten mit \Package{scrlfile}
@@ -132,8 +132,10 @@ komplett neuer \emph{Hook}-Mechanismus zur Verfügung. Statt Makros des
\LaTeX-Kerns umzudefinieren, macht \Package{scrlfile} ab Version 3.32 davon
auch Gebrauch. Dazu lädt es das interne Paket
\Package{scrlfile-hook}\IndexPackage[indexmain]{scrlfile-hook}. Bei älteren
-\LaTeX-Versionen wird dagegen das interne Paket
-\Package{scrlfile-patcholdkernel}%
+\LaTeX-Versionen wird dagegen je\ChangedAt{v3.35}{\Package{scrlfile}}
+ nach Kernel-Version das interne Paket
+\Package{scrlfile-hook-3.34}\IndexPackage[indexmain]{scrlfile-hook-3.34}
+beziehungsweise \Package{scrlfile-patcholdkernel}%
\IndexPackage[indexmain]{scrlfile-patcholdkernel} verwendet. Da mit dem neuen
Mechanismus in \LaTeX{} jedoch keine identische Funktionalität zu erreichen
war, wurden einige Anweisungen von \Package{scrlfile} als veraltet
@@ -149,7 +151,7 @@ veralteten Befehle in einer Weise, die in den meisten Fällen ausreichend sein
sollte. In jedem Fall sollte jedoch der Autor der entsprechenden Klasse oder
des entsprechenden Pakets verständigt werden, damit dieser eine Anpassung an
die aktuelle Version von \Package{scrlfile} oder direkt an \LaTeX{} ab Version
-2020-10-01 vornimmt.%
+2021-11-15 vornimmt.%
%
\EndIndexGroup
diff --git a/macros/latex/contrib/koma-script/source-doc/ngerman/tocbasic.tex b/macros/latex/contrib/koma-script/source-doc/ngerman/tocbasic.tex
index bafc7aadc2..35a9538014 100644
--- a/macros/latex/contrib/koma-script/source-doc/ngerman/tocbasic.tex
+++ b/macros/latex/contrib/koma-script/source-doc/ngerman/tocbasic.tex
@@ -1,6 +1,6 @@
% ======================================================================
% tocbasic.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% tocbasic.tex
-% Copyright (c) Markus Kohm, 2002-2020
+% Copyright (c) Markus Kohm, 2002-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{tocbasic.tex}
- [$Date: 2020-06-11 16:57:03 +0200 (Thu, 11 Jun 2020) $
+ [$Date: 2021-10-15 13:47:06 +0200 (Fri, 15 Oct 2021) $
KOMA-Script guide (package tocbasic)]
\chapter{Verzeichnisse verwalten mit Hilfe von \Package{tocbasic}}
@@ -2571,10 +2571,22 @@ möglich. Siehe dazu \autoref{sec:tocbasic.tocstyle},
Falls eine neue Gleitumgebung oder eine nicht gleitende Umgebung definiert
wird, so wird für diese auch ein neuer Zähler
\Counter{\PName{Eintragstyp}} (siehe Option \Option{type})
- angelegt. Dieser Zähler kann in gleicher Weise wie beispielsweise der
+ angelegt. Dieser Zähler kann, in gleicher Weise wie beispielsweise der
Zähler \Counter{figure} bei \Class{book}-Klassen von Zähler
- \Counter{chapter} abhängt, von einem \LaTeX-Zähler ahängig gemacht
- werden.}%
+ \Counter{chapter} abhängt, von einem \PName{\LaTeX-Zähler} abhängig gemacht
+ werden. Eine\ChangedAt{v3.35}{\Package{tocbasic}} Einstellung
+ \OptionValue{counterwithin}{chapter} wird bei Klassen mit
+ \DescRef{maincls.cmd.chapter}\IndexCmd{chapter} jedoch nur im Hauptteil
+ (siehe \DescRef{maincls.cmd.frontmatter}\IndexCmd{frontmatter},
+ \DescRef{maincls.cmd.mainmatter} und
+ \DescRef{maincls.cmd.backmatter}\IndexCmd{backmatter} in
+ \autoref{sec:maincls.separation}, \DescPageRef{maincls.cmd.frontmatter})
+ und nur dann beachtet, wenn der Zähler
+ \Counter{chapter}\IndexCounter{chapter} bei der Ausgabe größer als Null
+ ist. Bei Klassen ohne \DescRef{maincls.cmd.chapter} gilt dies entsprechend
+ für die Einstellung \OptionValue{counterwithin}{section} und Zähler
+ \Counter{section}\IndexCounter{section}\IndexCmd{section}.%
+ }%
\entry{\Option{float}}{%
Es wird nicht nur ein neuer Verzeichnistyp definiert, sondern auch
Gleitumgebungen \Environment{\PName{Eintragstyp}} (siehe Option
diff --git a/macros/latex/contrib/koma-script/source-doc/ngerman/typearea-experts.tex b/macros/latex/contrib/koma-script/source-doc/ngerman/typearea-experts.tex
index 7ef98de64f..352f2526a3 100644
--- a/macros/latex/contrib/koma-script/source-doc/ngerman/typearea-experts.tex
+++ b/macros/latex/contrib/koma-script/source-doc/ngerman/typearea-experts.tex
@@ -1,6 +1,6 @@
% ======================================================================
% typearea-experts.tex
-% Copyright (c) Markus Kohm, 2008-2019
+% Copyright (c) Markus Kohm, 2008-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% typearea-experts.tex
-% Copyright (c) Markus Kohm, 2008-2019
+% Copyright (c) Markus Kohm, 2008-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{typearea-experts.tex}
- [$Date: 2019-12-19 11:27:10 +0100 (Thu, 19 Dec 2019) $
+ [$Date: 2021-07-11 17:14:57 +0200 (Sun, 11 Jul 2021) $
KOMA-Script guide (chapter: typearea for experts)]
\chapter{Zusätzliche Informationen zum Paket \Package{typearea.sty}}
@@ -232,7 +232,7 @@ Einstellungen wieder zu reaktivieren.
\DescRef{\LabelBase.option.areasetadvanced}\IndexOption{areasetadvanced}
dazu, die Unterschiede zwischen der
\DescRef{typearea.cmd.typearea}-Voreinstellung und der späteren Verwendung
- von \DescRef{\LabelBase.cmd.areaset} auszugeleichen, wie dies bereits auf
+ von \DescRef{\LabelBase.cmd.areaset} auszugleichen, wie dies bereits auf
\DescPageRef{\LabelBase.option.areasetadvanced} erklärt wurde. Ohne diese
Maßnahme könnte es insbesondere bei Verwendung von Optionen wie
\DescRef{typearea.option.headinclude} und
diff --git a/macros/latex/contrib/koma-script/source-doc/ngerman/typearea.tex b/macros/latex/contrib/koma-script/source-doc/ngerman/typearea.tex
index b70c83fb6e..a9e9780ae0 100644
--- a/macros/latex/contrib/koma-script/source-doc/ngerman/typearea.tex
+++ b/macros/latex/contrib/koma-script/source-doc/ngerman/typearea.tex
@@ -1,6 +1,6 @@
% ======================================================================
% typearea.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2021
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% typearea.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2021
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -47,7 +47,7 @@
\KOMAProvidesFile{typearea.tex}
- [$Date: 2019-10-24 17:23:38 +0200 (Thu, 24 Oct 2019) $
+ [$Date: 2021-11-09 09:33:36 +0100 (Tue, 09 Nov 2021) $
KOMA-Script guide (chapter: typearea)]
\chapter{Satzspiegelberechnung mit \Package{typearea.sty}}
\labelbase{typearea}
@@ -777,10 +777,11 @@ mittelalterlichen Buchseitenkanon darstellt.
\OptionValue{DIV}{current}
\OptionValue{DIV}{last}
\end{Declaration}
-Wenn\ChangedAt{v3.00}{\Package{typearea}} Sie bis hier die Beispiele aufmerksam
-verfolgt haben, wissen Sie eigentlich bereits, wie man die Berechnung eines
-\Option{DIV}-Wertes in Abhängigkeit von der gewählten Schrift erreicht, wenn eine
-\KOMAScript-Klasse zusammen mit einem Schriftpaket verwendet wird.
+Wenn\ChangedAt{v3.00}{\Package{typearea}} Sie bis hier die Beispiele
+aufmerksam verfolgt haben, wissen Sie eigentlich bereits, wie man die
+Berechnung eines \Option{DIV}-Wertes in Abhängigkeit von der gewählten Schrift
+erreicht, wenn eine \KOMAScript-Klasse zusammen mit einem Schriftpaket
+verwendet wird.
\begin{Explain}
Das Problem dabei ist, dass die \KOMAScript-Klasse das Paket
@@ -844,6 +845,15 @@ darauf hingewiesen, dass auch die Verwendung des Pakets
\Package{fontenc}\IndexPackage{fontenc} dazu führen kann, dass \LaTeX{} eine
andere Schrift lädt.
+Falls die letzte Satzspiegelberechnung vor der Verwendung von
+\OptionValue{DIV}{last} oder \OptionValue{DIV}{current} mit Hilfe von
+\DescRef{\LabelBase.cmd.areaset}\IndexCmd{areaset} stattgefunden hat, wird
+übrigens auch die Neuberechnung wieder mit \DescRef{\LabelBase.cmd.areaset}
+durchgeführt. Sie entspricht dann
+\DescRef{\LabelBase.cmd.areaset}\POParameter{current}%
+\PParameter{\Length{textwidth}}\IndexLength{textwidth}%
+\PParameter{\Length{textheight}}\IndexLength{textheight}.
+
\begin{table}
\caption[{%
Symbolische Werte für Option \DescRef{typearea.option.DIV} und das