summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/doc/english
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/doc/english')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-options.tex29
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex10
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex5
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/linkalias.tex97
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex45
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex247
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex8
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex6
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex36
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex20
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex109
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex53
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex61
14 files changed, 468 insertions, 262 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-options.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-options.tex
index 241a6f2200f..f88e83f3bcd 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-options.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-options.tex
@@ -50,7 +50,7 @@
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Krickette Murabayashi\and Karl Hagen}
-% Date of the translated German file: 2017-12-07
+% Date of the translated German file: 2018-10-23
\section{Early or Late Selection of Options}
\seclabel{options}
@@ -138,24 +138,25 @@ described in \cite{latex:usrguide} or any introduction to \LaTeX, for example
necessary to load either one of these packages explicitly when using any
\KOMAScript{} class.}{}%
\par
-}
+}{}
% Umbruchoptimierung!!!
\IfThisCommonLabelBase{typearea}{Setting the options with
- \Macro{documentclass} or \Macro{usepackage} has one\textnote{Attention!}
- major disadvantage:
+ \Macro{documentclass} has one\textnote{Attention!} major disadvantage: %
}{%
- Note that the \Macro{documentclass} and \Macro{usepackage} have one drawback
- when using the option interface described bellow\textnote{Attention!}:
+ Note that \Macro{documentclass} has one drawback when using the option
+ interface described bellow\textnote{Attention!}: %
}%
-unlike the interface described below, the options in \Macro{documentclass} and
-\Macro{usepackage} are not robust. So commands, lengths, counters, and such
-constructs may break inside the optional argument of these commands. For
-example, using a \LaTeX{} length in the value of an option results in an error
-before the value is passed to \KOMAScript{} and it can take control of the
-option execution. So if you want to use a \LaTeX{} length, counter, or command
-as part of the value of an option, you have to use
-\DescRef{\LabelBase.cmd.KOMAoptions} or
+unlike the interface described below, the options in \Macro{documentclass} are
+not robust. So commands, lengths, counters, and such constructs may break
+inside the optional argument of this command. For example, with many
+not-\KOMAScript{} classes using a \LaTeX{} length in the value of an option
+results in an error%
+\IfThisCommonLabelBaseNotOneOf{maincls,scrlttr2}{ before the value is passed
+ to a \KOMAScript{} package and it can take control of the option
+ execution}{}%
+. So if you want to use a \LaTeX{} length, counter, or command as part of the
+value of an option, you should use \DescRef{\LabelBase.cmd.KOMAoptions} or
\DescRef{\LabelBase.cmd.KOMAoption}. These commands will be described next.%
%
\EndIndexGroup
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex
index 422721ad15d..3a3933167d9 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex
@@ -434,8 +434,8 @@
\IfThisCommonLabelBase{scrlayer-scrpage}{%
\begin{table}
\centering
- \caption[Available values for option \Option{markcase}]{Available values
- for option \Option{markcase} to select upper/lower case letter
+ \caption[Available values for the \Option{markcase} option]{Available
+ values for the \Option{markcase} option to select upper/lower case
typesetting in automatic running heads}%
\label{tab:\ThisCommonLabelBase.markcase}%
\begin{desctabular}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex
index 58dd710110a..4e576aba3d2 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-textmarkup.tex}
- [$Date: 2018-03-21 10:37:34 +0100 (Wed, 21 Mar 2018) $
+ [$Date: 2018-07-20 09:52:01 +0200 (Fri, 20 Jul 2018) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and
Karl Hagen}
@@ -733,6 +733,14 @@ refer to the sections for the respective element.%
\DescPageRef{\ThisCommonLabelBase.fontelement.parnumber});\par
\mbox{Default: \emph{empty}}%
}%
+ \feentry{sentencenumber}{%
+ \ChangedAt{v3.26}{\Package{scrjura}}%
+ sentence number of \DescRef{\ThisCommonLabelBase.cmd.Sentence}
+ (see \autoref{sec:\ThisCommonLabelBase.sentence},
+ \DescPageRef{%
+ \ThisCommonLabelBase.fontelement.sentencenumber});\par
+ \mbox{Default: \emph{empty}}%
+ }%
\end{desctabular}
\end{table}
}{%
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex
index 7386ccba9c7..1699a73c406 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex
@@ -45,14 +45,13 @@
%
% ======================================================================
-\documentclass[\languagename]{scrguide}
+\documentclass{scrguide}
\KOMAProvidesFile{guide.tex}
- [$Date: 2018-02-07 13:47:54 +0100 (Wed, 07 Feb 2018) $
+ [$Date: 2018-12-22 17:30:41 +0100 (Sat, 22 Dec 2018) $
KOMA-Script (guide main file)]
\begin{document}
-\expandafter\selectlanguage\expandafter{\uselanguage}
\csname ListTypeArea\endcsname
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/linkalias.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/linkalias.tex
index 3d4328a4891..0f1720cfabd 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/linkalias.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/linkalias.tex
@@ -1,6 +1,6 @@
% ======================================================================
% linkalias.tex
-% Copyright (c) Markus Kohm, 2008-2016
+% Copyright (c) Markus Kohm, 2008-2018
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% linkalias.tex
-% Copyright (c) Markus Kohm, 2008-2016
+% Copyright (c) Markus Kohm, 2008-2018
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -39,34 +39,83 @@
%
\KOMAProvidesFile{linkalias.tex}
- [$Date: 2017-12-03 22:49:27 +0100 (Sun, 03 Dec 2017) $
+ [$Date: 2018-07-18 13:58:44 +0200 (Wed, 18 Jul 2018) $
link aliases for the free version]
\makeatletter
-\newcommand*{\lalias}[2]{%
- \scr@ifundefinedorrelax{r@#1}{%
- \expandafter\let\csname r@#1\expandafter\endcsname\csname r@#2\endcsname
- }{%
+\newcommand*{\lalias}[3][]{%
+ \scr@ifundefinedorrelax{r@#3}{%
\ClassWarning{scrguide}{%
- Label alias `#1'\MessageBreak
- to `#2' ignored,\MessageBreak
- because of multiply definition%
+ Label alias `#2'\MessageBreak
+ to `#3' ignored,\MessageBreak
+ because `#3' undefined%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{r@#2}{%
+ \IfArgIsEmpty{#1}{%
+ \expandafter\let\csname r@#2\expandafter\endcsname
+ \csname r@#3\endcsname
+ }{%
+ \expandafter\let\expandafter\reserved@a\csname r@#3\endcsname
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter{\expandafter\@gobble\reserved@a}%
+ \expandafter\edef\csname r@#2\endcsname{%
+ {\unexpanded{#1}}\unexpanded\expandafter{\reserved@a}%
+ }%
+ }%
+ }{%
+ \ClassWarning{scrguide}{%
+ Label alias `#2'\MessageBreak
+ to `#3' ignored,\MessageBreak
+ because of multiply definition%
+ }%
+ \gdef \@multiplelabels {%
+ \@latex@warning@no@line{There were multiply-defined labels}}%
}%
- \gdef \@multiplelabels {%
- \@latex@warning@no@line{There were multiply-defined labels}}%
}%
}
\makeatother
-\lalias{desc:maincls-experts.cmd.ifthispageodd}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.cmd.rightmark}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.cmd.the}{sec:maincls-experts.experts}
-\lalias{desc:maincls-experts.option.parskip}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.env.addmargin*}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.cmd.marginpar}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.cmd.AfterBibliographyPreamble}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.option.fontsize}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.cmd.raggedsection}{sec:maincls-experts.coexistence}
-\lalias{desc:maincls-experts.cmd.thepage}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.cmd.pagemark}{sec:maincls-experts.addInfos}
-\lalias{desc:maincls-experts.cmd.the/Zaehler/}{sec:maincls-experts.addInfos}
+\lalias[\Macro{ifthispageodd}]
+ {desc:maincls-experts.cmd.ifthispageodd}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{rightmark}]
+ {desc:maincls-experts.cmd.rightmark}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{the}]
+ {desc:maincls-experts.cmd.the}
+ {sec:maincls-experts.experts}
+\lalias[\Option{parskip}]
+ {desc:maincls-experts.option.parskip}
+ {sec:maincls-experts.addInfos}
+\lalias[\Environment{addmargin*}]
+ {desc:maincls-experts.env.addmargin*}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{marginpar}]
+ {desc:maincls-experts.cmd.marginpar}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{AfterBibliographyPreamble}]
+ {desc:maincls-experts.cmd.AfterBibliographyPreamble}
+ {sec:maincls-experts.addInfos}
+\lalias[\Option{fontsize}]
+ {desc:maincls-experts.option.fontsize}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{raggedsection}]
+ {desc:maincls-experts.cmd.raggedsection}
+ {sec:maincls-experts.coexistence}
+\lalias[\Macro{thepage}]
+ {desc:maincls-experts.cmd.thepage}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{pagemark}]
+ {desc:maincls-experts.cmd.pagemark}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{the\PName{Zähler}}]
+ {desc:maincls-experts.cmd.the/Zaehler/}
+ {sec:maincls-experts.addInfos}
+\lalias[\Macro{the\PName{Counter}}]
+ {desc:maincls-experts.cmd.the/Counter/}
+ {sec:maincls-experts.addInfos}
+\lalias[\OptionValue{parskip}{relative}]
+ {desc:maincls-experts.option.parskip.relative}
+ {sec:maincls-experts.addInfos}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex
index 714e020a933..691c2e7ee13 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex
@@ -46,11 +46,11 @@
% ======================================================================
\KOMAProvidesFile{scrbase.tex}
- [$Date: 2018-03-30 11:57:25 +0200 (Fri, 30 Mar 2018) $
+ [$Date: 2018-08-27 08:53:35 +0200 (Mon, 27 Aug 2018) $
KOMA-Script package scrbase]
\translator{Markus Kohm\and Melvin Hendrix\and Karl Hagen}
-% Date of the translated German file: 2018-02-15
+% Date of the translated German file: 2018-08-27
\chapter{Basic Functions in the \Package{scrbase} Package}
\labelbase{scrbase}
@@ -753,16 +753,23 @@ is called applies.%
\begin{Declaration}
- \Macro{FamilyLengthKey}\OParameter{member}\Parameter{family}%
- \Parameter{key}%
- \OParameter{default}\Parameter{length}%
- \Macro{FamilySetLength}\Parameter{family}%
- \Parameter{key}\Parameter{length}\Parameter{value}%
- \Macro{FamilyLengthMacroKey}\OParameter{member}\Parameter{family}%
- \Parameter{key}%
- \OParameter{default}\Parameter{Makro}%
- \Macro{FamilySetLengthMacro}\Parameter{family}%
- \Parameter{key}\Parameter{Makro}\Parameter{value}%
+ \Macro{FamilyLengthKey}\OParameter{member}\Parameter{family}
+ \Parameter{key}
+ \OParameter{default}\Parameter{length}
+ \Macro{FamilySetLength}\Parameter{family}
+ \Parameter{key}\Parameter{length}\Parameter{value}
+ \Macro{FamilyLengthMacroKey}\OParameter{member}\Parameter{family}
+ \Parameter{key}
+ \OParameter{default}\Parameter{Makro}
+ \Macro{FamilySetLengthMacro}\Parameter{family}
+ \Parameter{key}\Parameter{Makro}
+ \Parameter{value}%
+ \Macro{FamilyUseLengthMacroKey}\OParameter{member}\Parameter{family}
+ \Parameter{key}
+ \OParameter{default}\Parameter{Makro}
+ \Macro{FamilySetUseLengthMacro}\Parameter{family}
+ \Parameter{key}\Parameter{Makro}
+ \Parameter{value}%
\end{Declaration}
With\ChangedAt{v3.12}{\Package{scrbase}} \Macro{FamilyLengthKey}, you can
define a \PName{key} that represents a \PName{length}. It does not matter
@@ -779,8 +786,18 @@ If\ChangedAt{v3.15}{\Package{scrbase}} the value is omitted, the
\PName{default} is used instead. If there is no \PName{default}, the
\PName{key} can be used only with an explicit value.
-\Macro{FamilyLengthMacroKey} and \Macro{FamilySetLengthMacro} store the
-\PName{value} not in a \PName{length} but in a \Macro{macro}.%
+% New translation by MJK (please fix it!):
+\Macro{FamilyLengthMacroKey} and \Macro{FamilySetLengthMacroKey} respectively
+\Macro{FamilySetLengthMacro} and \Macro{FamilySetUseLengthMacro} store the
+\PName{value} not in a \PName{length} but in a
+\PName{macro}. \Macro{FamilyLengthMacroKey} and
+\Macro{FamilySetLengthMacroKey} define \PName{macro} to be the current
+\PName{value} similar to the \Macro{setlength}. In opposite to this,
+\Macro{FamilyUseLengthMacroKey}\ChangedAt{v3.20}{\Package{scrbase}} and
+\Macro{FamilySetUseLengthMacroKey} define \PName{macro} to be \PName{value} as
+given. So \PName{value} is evaluated whenever \PName{macro} is used instead of
+when \PName{macro} is defined.%
+% End of new translation.
\EndIndexGroup
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex
index c01bbdada5d..17734f58c26 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex
@@ -48,13 +48,13 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-experts.tex}
- [$Date: 2018-03-30 11:57:25 +0200 (Fri, 30 Mar 2018) $
+ [$Date: 2018-10-14 20:31:51 +0200 (Sun, 14 Oct 2018) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for
experts)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Karl Hagen}
-% Date of the translated German file: 2018-02-13
+% Date of the translated German file: 2018-10-14
\chapter[{Additional Information about the Main Classes and
\Package{scrextend}}]{Additional Information about the Main Classes
@@ -516,69 +516,75 @@ its font settings using \DescRef{maincls.cmd.setkomafont} or
\toprule
\PName{key} & \PName{value} & Description \\
\midrule%
- \PValue{counterwithin} & \PName{counter name} & The value of the
- counter of the heading should depend on \PName{counter name}. Whenever
- \Macro{stepcounter} or \Macro{refstepcounter} increases the value of
- \PName{counter name}, the value of the counter of this heading is
- reset to 0. In addition, \Macro{the\PName{counter name}} is prefixed
- with a dot when this counter is output.\\
+ \PValue{counterwithin}
+ & \PName{counter name}
+ & The value of the counter of the heading should depend on \PName{counter
+ name}. Whenever \Macro{stepcounter} or \Macro{refstepcounter} increases
+ the value of \PName{counter name}, the value of the counter of this
+ heading is reset to 0. In addition, \Macro{the\PName{counter name}} is
+ prefixed with a dot when this counter is output.\\
\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and
- \Class{scrartl}}%
- \PValue{counterwithout} & \PName{counter name} & Cancels a prior
- \PValue{counterwithin} setting. Therefore it makes sense only if you
- redefine an existing sectioning command.\\
- \PValue{expandtopt} & \PName{switch}& If the switch is on, all subsequent
- values for lengths will be completely expanded, evaluated, and stored as
- \texttt{pt} values when they are defined. This means lengths no longer
- depend on the current font size. If the switch is off, all subsequent
- values for lengths will be tentatively expanded and evaluated but stored
- for full evaluation at application time. You can use any values from
- \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}. The
- default is \PValue{false}.\\
- \PValue{level} & \PName{integer} & The numerical value of the sectioning level
- (see the \DescRef{maincls.counter.secnumdepth} counter,
- \autoref{sec:maincls.structure},
- \DescPageRef{maincls.counter.secnumdepth});
- the value should be unique and is mandatory for new levels.\\
- \PValue{style} & \PName{name} & Defines the style of the
- heading.\\
- \ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and
\Class{scrartcl}}%
- \PValue{tocstyle} & \PName{name} & Defines the style of the entries in
- the table of contents. You can use every previously defined TOC-entry style
- (see \autoref{sec:tocbasic.tocstyle}). An empty \PName{name} prevents a
- new definition of the TOC-entry
- command \Macro{l@\dots}.\\
- \ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and
+ \PValue{counterwithout}
+ & \PName{counter name}
+ & Cancels a prior \PValue{counterwithin} setting. Therefore it makes sense
+ only if you redefine an existing sectioning command.\\
+ \PValue{expandtopt}
+ & \PName{switch}
+ & If the switch is on, all subsequent values for lengths will be
+ completely expanded, evaluated, and stored as \texttt{pt} values when
+ they are defined. This means lengths no longer depend on the current
+ font size. If the switch is off, all subsequent values for lengths will
+ be tentatively expanded and evaluated but stored for full evaluation at
+ application time. You can use any values from
+ \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}.
+ The default is \PValue{false}.\\
+ \PValue{level}
+ & \PName{integer}
+ & The numerical value of the sectioning level (see the
+ \DescRef{maincls.counter.secnumdepth} counter,
+ \autoref{sec:maincls.structure},
+ \DescPageRef{maincls.counter.secnumdepth}); the value should be unique
+ and is mandatory for new levels.\\
+ \PValue{style}
+ & \PName{name}
+ & Defines the style of the heading.\\
+ \ChangedAt{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and
\Class{scrartcl}}%
- \PValue{toc\PName{option}} & \PName{value} & Additional options depending
- on the TOC-entry style selected with \Option{tocstyle}. See
- \autoref{sec:tocbasic.tocstyle}, \autopageref{sec:tocbasic.tocstyle} for
- additional information about TOC-entry styles. You can find the attributes
- that can be used as \PName{option}s for the predefined TOC-entry styles of
- the \Package{tocbasic} package in
- \autoref{tab:tocbasic.tocstyle.attributes},
- \autopageref{tab:tocbasic.tocstyle.attributes}.\\
- % \PValue{tocindent} & \PName{length} & Total indentation from the left
- % margin of the entry in the table of
- % contents corresponding to this
- % heading, if and only if such an
- % entry will be made (see
- % \DescRef{maincls.counter.tocdepth} (siehe
- % \autoref{sec:maincls.toc},
- % \DescPageRef{maincls.counter.tocdepth}).\\
- % \PValue{toclevel} & \PName{integer} &
- % A number denoting the depth of the
- % entry in the table of contents
- % corresponding to this heading, if
- % this should differ from
- % \PValue{level} (see
- % \DescRef{maincls.counter.tocdepth} in
- % \autoref{sec:maincls.toc},
- % \DescPageRef{maincls.counter.tocdepth}). \\
- % \PValue{tocnumwidth} & \PName{length} &
- % Width of the box for the number of
- % the entry in the table of contents.\\
+ \PValue{tocstyle}
+ & \PName{name}
+ & Defines the style of the entries in the table of contents. You can use
+ every previously defined TOC-entry style (see
+ \autoref{sec:tocbasic.tocstyle}). An empty \PName{name} prevents a new
+ definition of the TOC-entry command \Macro{l@\dots}.\\
+ \ChangedAt{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ \PValue{toc\PName{option}}
+ & \PName{value}
+ & Additional options depending on the TOC-entry style selected with
+ \Option{tocstyle}. See \autoref{sec:tocbasic.tocstyle},
+ \autopageref{sec:tocbasic.tocstyle} for additional information about
+ TOC-entry styles. You can find the attributes that can be used as
+ \PName{option}s for the predefined TOC-entry styles of the
+ \Package{tocbasic} package in
+ \autoref{tab:tocbasic.tocstyle.attributes},
+ \autopageref{tab:tocbasic.tocstyle.attributes}.\\
+ % \PValue{tocindent}
+ % & \PName{length}
+ % & Total indentation from the left margin of the entry in the table of
+ % contents corresponding to this heading, if and only if such an
+ % entry will be made (see \DescRef{maincls.counter.tocdepth},
+ % \autoref{sec:maincls.toc}, \DescPageRef{maincls.counter.tocdepth}).\\
+ % \PValue{toclevel}
+ % & \PName{integer}
+ % & A number denoting the depth of the entry in the table of contents
+ % corresponding to this heading, if this should differ from
+ % \PValue{level} (see \DescRef{maincls.counter.tocdepth},
+ % \autoref{sec:maincls.toc}, \DescPageRef{maincls.counter.tocdepth}). \\
+ % \PValue{tocnumwidth}
+ % & \PName{length}
+ % & Width of the box for the number of the entry in the table of
+ % contents.\\
\bottomrule
\end{tabularx}
\end{table}
@@ -593,20 +599,55 @@ its font settings using \DescRef{maincls.cmd.setkomafont} or
\toprule
\PName{key} & \PName{value} & Description \\
\midrule
- \PValue{afterskip} & \PName{length} & A negative value activates a run-in
- heading. The absolute value is the horizontal space after the heading. A
- positive value is the vertical skip below the heading.\\
- \PValue{beforeskip} & \PName{length} & The amount indicates the vertical
- skip before the heading. If the value is negative, a positive distance
- is still inserted, but in this case the paragraph indent of the text
- following the heading is suppressed.\\
- \PValue{font} & \PName{font commands} & The font settings that should be
- used for the heading in addition to
+% TODO: New translation by Markus Kohm (please fix)
+ \PValue{afterindent}%
+ \ChangedAt{v3.26}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ & \PName{switch}
+ & The \PName{switch} defines whether or not to allow the indent of the
+ paragraph following a free-standing heading (see \PValue{runin}). With
+ the default \PValue{bysign} the sign of \PValue{beforeskip} defines the
+ behaviour. If the value of \PValue{beforeskip} is negative, the
+ paragraph indent of the text following the heading is suppressed. You
+ can use any values from \autoref{tab:truefalseswitch},
+ \autopageref{tab:truefalseswitch} to explicitly allow or suppress that
+ paragraph indent.\\
+ \PValue{afterskip}
+ & \PName{length}
+ & In case of a run-in heading, the absolute value is the horizontal space
+ after the heading. In case of a free-standing heading, the value of the
+ vertical skip below the heading. With \OptionValue{runin}{bysign}, a
+ positive value activates a free-standing heading and a negative value or
+ zero activates a run-in heading.\\
+ \PValue{beforeskip}
+ & \PName{length}
+ & The vertical skip before the heading. With
+ \OptionValue{afterindent}{bysign}, if the value is negative, a positive
+ distance\,---\,the amount of \PName{length}\,---\,is still inserted, but
+ in this case the paragraph indent of the text following the heading is
+ suppressed.\\
+% End of new translation
+ \PValue{font}
+ & \PName{font commands}
+ & The font settings that should be used for the heading in addition to
\DescRef{maincls.fontelement.disposition}. You can use all settings that
are allowed for \DescRef{maincls.cmd.setkomafont} and
\DescRef{maincls.cmd.addtokomafont} for the element of the heading.\\
- \PValue{indent} & \PName{length} & The indentation of heading from the
- left margin.\\
+ \PValue{indent}
+ & \PName{length}
+ & The indentation of heading from the left margin.\\
+% TODO: New translation by Markus Kohm (please fix)!
+ \PValue{runin}
+ \ChangedAt{v3.26}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ & \PName{switch}
+ & Defines whether to use a run-in heading or a free-standing heading. With
+ the default \PValue{bysign} the sign of \PValue{afterskip} defines the
+ behaviour. In this case, a positive value of \PValue{afterskip}
+ deactivates a run-in heading. You can use any values from
+ \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch} to
+ explicitly activate or deactivate a run-in heading.\\
+% End of new translation
\bottomrule
\end{tabularx}
\end{table}
@@ -621,14 +662,31 @@ its font settings using \DescRef{maincls.cmd.setkomafont} or
\toprule
\PName{key} & \PName{value} & Description \\
\midrule
- \PValue{afterskip} & \PName{length} & The value is the vertical skip below
- the heading.\\
- \PValue{beforeskip} & \PName{length} & The value of the vertical skip
- before the heading. If the value is negative, then the positive distance
- is nevertheless inserted, and the paragraph indent of the text following
- the heading is suppressed. There will also be no indentation even for
- positive values if the \DescRef{maincls.option.version} class option is
- set to a value less than 3.22.\\
+% TODO: New translation by Markus Kohm (please fix)
+ \PValue{afterindent}%
+ \ChangedAt{v3.26}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ & \PName{switch}
+ & The \PName{switch} defines whether or not to allow the indent of the
+ paragraph following a heading. With the default \PValue{bysign} the sign
+ of \PValue{beforeskip} defines the behaviour. If the value of
+ \PValue{beforeskip} is negative, the paragraph indent of the text
+ following the heading is suppressed. You can use any values from
+ \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch} to
+ explicitly allow or suppress that paragraph indent.\\
+ \PValue{afterskip}%
+ \ChangedAt{v3.26}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ & \PName{length}
+ & The vertical skip below the heading.\\
+ \PValue{beforeskip}
+ & \PName{length}
+ & The vertical skip before the heading. With
+ \OptionValue{afterindent}{bysign}, if the value is negative, a positive
+ distance\,---\,the amount of \PName{length}\,---\,is still inserted, but
+ in this case the paragraph indent of the text following the heading is
+ suppressed.\\
+% End of new translation
\PValue{font} & \PName{font commands} & The font setting to use for the
heading in addition to \DescRef{maincls.fontelement.disposition}. You
can use all settings, that are allowed for
@@ -660,10 +718,33 @@ its font settings using \DescRef{maincls.cmd.setkomafont} or
\toprule
\PName{key} & \PName{value} & Description \\
\midrule
+% TODO: New translation by Markus Kohm (please fix)
+ \PValue{afterindent}%
+ \ChangedAt{v3.26}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ & \PName{switch}
+ & The \PName{switch} defines whether or not to allow the indent of the
+ paragraph following a heading. With
+ value \PValue{bysign} the sign of \PValue{beforeskip} defines the
+ behaviour. If the value of \PValue{beforeskip} is negative, the
+ paragraph indent of the text following the heading is suppressed. You
+ can use any values from \autoref{tab:truefalseswitch},
+ \autopageref{tab:truefalseswitch} to explicitly allow or suppress that
+ paragraph indent. For compatibility, the default of \Class{scrartcl} is
+ \PValue{false} and the default of \Class{scrbook} and \Class{scrreprt}
+ is \PValue{true}.\\
+% End of new translation
\PValue{afterskip} & \PName{length} & The value is the vertical skip below
the heading.\\
- \PValue{beforeskip} & \PName{length}& The value is the vertical skip above
- the heading.\\
+% TODO: New translation by Markus Kohm (please fix)
+ \PValue{beforeskip}
+ & \PName{length}
+ & The vertical skip before the heading. With
+ \OptionValue{afterindent}{bysign}, if the value is negative, a positive
+ distance\,---\,the amount of \PName{length}\,---\,is still inserted, but
+ in this case the paragraph indent of the text following the heading is
+ suppressed.\\
+% End of new translation
\PValue{font} & \PName{font commands} & The font setting to use for the
heading in addition to \DescRef{maincls.fontelement.disposition}. You
can use all settings that are allowed for
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex
index c362c2d42c4..f123ae10aec 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex
@@ -46,7 +46,7 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle.tex}
- [$Date: 2018-03-30 11:57:25 +0200 (Fri, 30 Mar 2018) $
+ [$Date: 2018-04-09 10:14:11 +0200 (Mon, 09 Apr 2018) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)]
\translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and
@@ -379,11 +379,11 @@ You can find an overview of all available values for the \PName{setting} of
\Option{toc}. in \autoref{tab:\LabelBase.toc}.
\begin{desclist}
- \desccaption[{Available values of the \Option{toc} option}]{%
- Available values of the \Option{toc} option to set the format and contents
+ \desccaption[{Available values for the \Option{toc} option}]{%
+ Available values for the \Option{toc} option to set the format and contents
of the table of contents\label{tab:\LabelBase.toc}%
}{%
- Available values of the \Option{toc} option (\emph{continued})%
+ Available values for the \Option{toc} option (\emph{continued})%
}%
\entry{\PValue{bibliography}, \PValue{bib}}{%
The bibliography has an unnumbered entry in the table of contents.%
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex
index f168ad4ddd8..5504ee4b0da 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{scrextend.tex}
- [$Date: 2018-03-27 11:46:14 +0200 (Tue, 27 Mar 2018) $
+ [$Date: 2018-04-09 10:14:11 +0200 (Mon, 09 Apr 2018) $
KOMA-Script package scrextend]
\translator{Markus Kohm\and Karl Hagen}
@@ -136,8 +136,8 @@ argument of \DescRef{\LabelBase.cmd.usepackage}\PParameter{scrextend}. %
\autoref{tab:scrextend.optionalFeatures}.
\begin{table}
- \caption[{available extended features of
- \Package{scrextend}}]{overview of the optional extended
+ \caption[{Available extended features of
+ \Package{scrextend}}]{Overview of the optional extended
features of \Package{scrextend}}
\label{tab:scrextend.optionalFeatures}
\begin{desctabular}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex
index 1d19af010aa..8b1ce07b2e0 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex
@@ -46,12 +46,12 @@
% ======================================================================
\KOMAProvidesFile{scrjura.tex}%
- [$Date: 2018-03-30 11:57:25 +0200 (Fri, 30 Mar 2018) $
+ [$Date: 2018-07-20 09:52:01 +0200 (Fri, 20 Jul 2018) $
KOMA-Script guide (chapter: scrjura)]
\translator{Alexander Willand\and Markus Kohm\and Karl Hagen}
-% Date of the translated German file: 2018-02-06
+% Date of the translated German file: 2018-07-20
\chapter{Support for the Law Office with \Package{scrjura}}
\labelbase{scrjura}
@@ -532,13 +532,27 @@ error-prone, it has not yet been implemented in
\Package{scrjura}. Semi-automatic numbering, however, is supported.
\begin{Declaration}
- \Counter{sentence}%
- \Macro{thesentence}%
+ \Counter{sentence}
+ \Macro{thesentence}
+ \Macro{sentencenumberformat}
\Macro{Sentence}
\end{Declaration}
Manual numbering of sentences is done with the \Macro{Sentence} command. It
-adds one to the \Counter{sentence} counter. By default, \Macro{thesentence}
-is printed as an Arabic number.
+adds one to the \Counter{sentence} counter. By default,
+\Macro{sentencenumberformat}\ChangedAt{v3.26}{\Package{scrjura}} prints the
+Arabic number of \Macro{thesentence} as superscript.
+
+\BeginIndex{FontElement}{sentencenumber}\LabelFontElement{sentencenumber}%
+The\ChangedAt{v3.26}{\Package{scrjura}} sentence number is usually printed
+using the currently active font. However, you can change this default for the
+\FontElement{parnumber} element at any time with
+\DescRef{\LabelBase.cmd.setkomafont}%
+\important[i]{\DescRef{\LabelBase.cmd.setkomafont},
+ \DescRef{\LabelBase.cmd.addtokomafont}} and
+\DescRef{\LabelBase.cmd.addtokomafont} (see
+\autoref{sec:\LabelBase.textmarkup},
+\DescPageRef{\LabelBase.cmd.setkomafont}).%
+\EndIndex{FontElement}{sentencenumber}%
Using\textnote{Hint!} \Package{babel}\IndexPackage{babel} offers an easy way
to define a shorthand for \Macro{Sentence}:%
@@ -639,8 +653,8 @@ You can find the available values and their meaning in
%\begin{desclist}
% \desccaption
\caption[{%
- Available values for the\Option{ref} option to configure the cross-reference
- format%
+ Available values for the \Option{ref} option to configure the
+ cross-reference format%
}]{%
Available values for the \Option{ref} option to configure the
cross-reference format of \DescRef{\LabelBase.cmd.ref},
@@ -902,10 +916,10 @@ package will throw an error.%
\setcapindent{0pt}%
\begin{captionbeside}
[{%
- Meanings and English defaults of language dependent terms%
+ Meanings and English defaults of language-dependent terms%
}]{%
- Meanings and English defaults of language dependent terms if not already
- defined%
+ Meanings and English defaults of language-dependent terms, if not
+ already defined%
} [l]
\begin{tabular}[t]{lll}
\toprule
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex
index 65c8cf865d6..5488fe2cb07 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex
@@ -46,12 +46,12 @@
% ============================================================================
\KOMAProvidesFile{scrlayer.tex}
- [$Date: 2018-02-28 13:23:23 +0100 (Wed, 28 Feb 2018) $
+ [$Date: 2018-12-15 15:01:34 +0100 (Sat, 15 Dec 2018) $
KOMA-Script guide (chapter:scrlayer)]
\translator{Markus Kohm\and Karl Hagen}
-% Date of the translated German file: 2018-02-01
+% Date of the translated German file: 2018-12-15
\chapter[{Defining Layers and Page Styles with \Package{scrlayer}}]
{Defining\ChangedAt{v3.12}{\Package{scrlayer}} Layers and Page Styles with
@@ -628,7 +628,7 @@ are copied to \Macro{layervalign}. The value \PValue{c}, which is both
horizontal and vertical, is copied to both commands. If there are several
conflicting values for \PValue{align}, only the last one is copied. Thus the
resulting \Macro{layerhalign} is either \PValue{l}, \PValue{c}, or \PValue{r},
-and the resulting \Macro{layervalign} is either \PValue{r}, \PValue{c}, or
+and the resulting \Macro{layervalign} is either \PValue{t}, \PValue{c}, or
\PValue{b}.
Redefining\textnote{Attention!} these instructions to change the values stored
@@ -839,6 +839,7 @@ styles, not just those defined with \Package{scrlayer}.
\begin{Declaration}
\Macro{currentpagestyle}
+ \Macro{toplevelpagestyle}
\end{Declaration}
The \Package{scrlayer} package patches the \DescRef{maincls.cmd.pagestyle}
command so that it sets \Macro{currentpagestyle} to the currently active page
@@ -857,7 +858,18 @@ Additionally, \Macro{currentpagestyle} is empty after loading
\Package{scrlayer} and before using \DescRef{maincls.cmd.pagestyle} for the
first time. Therefore, when defining an end-user interface, you may find it
useful to set the current page style to a default with an implicit
-\DescRef{maincls.cmd.pagestyle} statement.%
+\DescRef{maincls.cmd.pagestyle} statement.
+
+% Todo: New translation by Markus Kohm (please fix it!)
+For page-style aliases activated using \DescRef{maincls.cmd.pagestyle}
+\Macro{currentpagestyle} does not show the alternative name but the name of
+the real page style. You\ChangedAt{v3.16}{\Package{scrlayer}} can get the
+alternative name using \Macro{toplevelpagestyle}. However, it is not
+recommended to define page styles, that have different results depending on
+\Macro{toplevelpagestyle}, e.\,g., using \DescRef{scrbase.cmd.ifstr}. If you
+would activate such a page style using \DescRef{maincls.cmd.thispagestyle} you
+could get the wrong result.%
+% End of new translation.
\EndIndexGroup
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex
index 2e0af8b703d..f209b2addf2 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex
@@ -46,14 +46,14 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2-experts.tex}
- [$Date: 2018-03-21 10:37:34 +0100 (Wed, 21 Mar 2018) $
+ [$Date: 2018-04-26 14:55:38 +0200 (Thu, 26 Apr 2018) $
KOMA-Script guide (chapter: scrlttr2 for experts)]
\translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe
Morawski\and Stephan Hennig\and Gernot Hassenpflug\and Markus Kohm\and
Karl Hagen}
-% Date of the translated German file: 2018-01-02
+% Date of the translated German file: 2018-04-26
\chapter{Additional Information about the \Class{scrlttr2} Class and the
\Package{scrletter} Package}
@@ -383,45 +383,37 @@ required pseudo-lengths have been omitted.
\begin{Declaration}
- \Macro{@newplength}\Parameter{name}
+ \Macro{newplength}\Parameter{name}
\end{Declaration}
-This command defines a new pseudo-length. The new pseudo-length is
-uniquely identified by its \PName{name}. Each name can therefore be
-assigned only once. If you attempt to redefine an existing pseudo-length, the
-commands exits with an error message.
-
+This\ChangedAt{v3.26}{\Class{scrlttr2}\and \Package{scrletter}} command
+defines a new pseudo-length. The new pseudo-length is uniquely identified by
+its \PName{name}. Each name can therefore be assigned only once. If you
+attempt to redefine an existing pseudo-length, the commands exits with an
+error message.
+
+% TODO: Optimize translation!
+\BeginIndex{Cmd}{@newplength}%
Since the ordinary user does not normally need to define pseudo-lengths, this
-command is not a user instruction. It cannot be used within a document, but it
-can, for example, be used within an \File{lco}
-file\Index{lco file=\File{lco} file}.
-%
-\iftrue % Umbruchoptimierung!!!
-\iffree{}{ If you want to
- define a pseudo-length inside the document anyway, you can override the
- restriction with the help of
- \Macro{makeatletter}\important[i]{\Macro{makeatletter}\\
- \Macro{makeatother}}\IndexCmd{makeatletter} and
- \Macro{makeatother}\IndexCmd{makeatother} (see
- \cite{UK:FAQ}). But\textnote{Attention!} you should never use these two
- commands inside an \File{lco} file!}%
-\fi
-%
+command has not been a user instruction until \KOMAScript~3.26. Instead of it
+there was only \Macro{@newplength} with the same functionality. For package
+authors \Macro{@newplength} still exists.%
+% :ODOT
\EndIndexGroup
\begin{Declaration}
- \Macro{@setplength}%
+ \Macro{setplength}%
\OParameter{factor}\Parameter{pseudo-length}\Parameter{value}%
- \Macro{@addtoplength}%
+ \Macro{addtoplength}%
\OParameter{factor}\Parameter{pseudo-length}\Parameter{value}
\end{Declaration}
-Using \Macro{@setplength}, you can assign the multiple of a
+Using \Macro{setplength}, you can assign the multiple of a
\PName{value} to a \PName{pseudo-length}. The \PName{factor} is given as an
optional argument (see also \DescRef{scrlttr2.cmd.setlengthtoplength},
\autoref{sec:scrlttr2.pseudoLength},
\DescPageRef{scrlttr2.cmd.setlengthtoplength}).
-With \Macro{@addtoplength} you can add the multiple of a \PName{value} to a
+With \Macro{addtoplength} you can add the multiple of a \PName{value} to a
\PName{pseudo-length}. Again, you can pass a \PName{factor} as an optional
argument.
@@ -432,18 +424,39 @@ within the \PName{value}. To subtract the value of one \PName{pseudo-length}
from another \PName{pseudo-length}, you use should use at the same time a
minus sign or \PValue{-1} as the \PName{factor}.
-Since the ordinary user does not normally need to define pseudo-lengths, this
-command is not a user instruction. It cannot be used within a document, but it
-can, for example, be used within an \File{lco}
-file\Index{lco file=\File{lco} file}.\iffree{}{ If you want to
- define a pseudo-length inside the document anyway, you can override the
- restriction with the help of
- \Macro{makeatletter}\important[i]{\Macro{makeatletter}\\
- \Macro{makeatother}}\IndexCmd{makeatletter} and
- \Macro{makeatother}\IndexCmd{makeatother} (see
- \cite{UK:FAQ}). But\textnote{Attention!} you should never use these two
- commands inside an \File{lco} file!}%
-%
+% TODO: Optimize translation!
+\BeginIndex{Cmd}{@setplength}%
+\BeginIndex{Cmd}{@addtoplength}%
+Since the ordinary user does not normally need to define pseudo-lengths, these
+commands has not been user instructions until \KOMAScript~3-26. Instead of
+them there where only \Macro{@setplength} and \Macro{@addtoplength} with the
+same functionality. For package authors that commands still exist.%
+% :ODOT
+\EndIndexGroup
+
+% TODO: Optimize translation!
+\begin{Declaration}
+ \Macro{setplengthtowidth}
+ \OParameter{factor}\Parameter{pseudo-length}\Parameter{content}%
+ \Macro{setplengthtoheight}
+ \OParameter{factor}\Parameter{pseudo-length}\Parameter{content}%
+ \Macro{setplengthtodepth}
+ \OParameter{factor}\Parameter{pseudo-length}\Parameter{content}%
+ \Macro{setplengthtototalheight}
+ \OParameter{factor}\Parameter{pseudo-length}\Parameter{content}%
+\end{Declaration}
+The\ChangedAt{v3.26}{\Class{scrlttr2}\and \Package{scrletter}} three commands
+from the beginning correspond with \Macro{settowidth},
+\Macro{settoheight}, and \Macro{settodepth} of the \LaTeX{} kernel, but to set
+a \PName{pseudo-length} instead of a length. Like
+\DescRef{\LabelBase.cmd.setplength} the commands are extended by an optional
+\PName{factor}. So they are setting a \PName{pseudo-length} to the natural
+width, height or depth of the given \PName{content} multiplied by the optional
+\PName{factor}. The additional command
+\Macro{setplengthtototalheight} sets the \PName{pseudo-length} to the sum of
+height and depth of \PName{content} multiplied by the optional
+\PName{factor}.%
+% :ODOT
\EndIndexGroup
@@ -666,7 +679,7 @@ predefined \File{lco} files, the length of this rule is calculated
automatically taking into account, for example, letterhead width or an
optional logo. You can adjust rule length manually in your own \File{lco}
files by setting this pseudo-length to positive values using
-\Macro{\@setplength} (see \DescPageRef{scrlttr2-experts.cmd.@setplength}). The
+\Macro{setplength} (see \DescPageRef{scrlttr2-experts.cmd.setplength}). The
default thickness of the line\ChangedAt{v2.97c}{\Class{scrlttr2}},
\PLength{fromrulethickness}, is 0.4\Unit{pt}.%
\EndIndexGroup
@@ -735,10 +748,10 @@ standards for window envelopes. Typical values are between 70\Unit{mm} and
\ProvidesFile{SNmmarg.lco}
[2002/06/04 v0.1 my lco]
\LoadLetterOption{SN}
- \@addtoplength{toaddrwidth}{%
+ \addtoplength{toaddrwidth}{%
-\useplength{toaddrhpos}}
- \@setplength{toaddrhpos}{-15mm}
- \@addtoplength{toaddrwidth}{%
+ \setplength{toaddrhpos}{-15mm}
+ \addtoplength{toaddrwidth}{%
\useplength{toaddrhpos}}
\endinput
\end{lstcode}
@@ -1006,8 +1019,8 @@ that overlapping with other elements is unlikely.
\begin{lstcode}
\ProvidesFile{lawsubj.lco}
[2008/11/03 lawyers lco file]
- \@setplength{subjectvpos}{\useplength{refvpos}}
- \@addtoplength{refvpos}{3\baselineskip}
+ \setplength{subjectvpos}{\useplength{refvpos}}
+ \addtoplength{refvpos}{3\baselineskip}
\endinput
\end{lstcode}
If you want to leave at least one empty line between the subject and the
@@ -1369,8 +1382,8 @@ forget about this option and skip the example.%
\ProvidesFile{a5.lco}
[2002/05/02 letter class option]
\LetterOptionNeedsPapersize{a5}{a5}
- \@setplength{tfoldmarkvpos}{\paperheight}
- \@setplength{bfoldmarkvpos}{\paperheight}
+ \setplength{tfoldmarkvpos}{\paperheight}
+ \setplength{bfoldmarkvpos}{\paperheight}
\end{lstcode}
Of course, it would be more elegant to deactivate the marks with the
\DescRef{scrlttr2.option.foldmarks} option. In addition, you must adjust the
@@ -1809,7 +1822,7 @@ The exact format can be found in \autoref{tab:date}.%
\KOMAoptions{captions=topbeside}%
\setcapindent{0pt}%
% \caption
- \begin{captionbeside}{Language-dependent Forms of the Date}[l]
+ \begin{captionbeside}{Language-dependent forms of the date}[l]
\begin{tabular}[t]{ll}
\toprule
Command & Date Example \\
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex
index ff758441c91..7f6129eab65 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex
@@ -46,14 +46,14 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2.tex}%
- [$Date: 2018-03-30 11:57:25 +0200 (Fri, 30 Mar 2018) $
+ [$Date: 2018-07-18 14:12:27 +0200 (Wed, 18 Jul 2018) $
KOMA-Script guide (chapter: scrlttr2)]
\translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe
Morawski\and Stephan Hennig\and Gernot Hassenpflug\and Markus Kohm\and
Karl Hagen}
-% Date of the translated German file: 2018-02-13
+% Date of the translated German file: 2018-04-26
\chapter{Letters with the \Class{scrlttr2} Class or the \Package{scrletter}
Package}
@@ -429,9 +429,9 @@ sections of this chapter.
Since users will usually not need to define their own pseudo-lengths, the
method for defining them is described in the part for experts, in
\autoref{sec:scrlttr2-experts.pseudoLengths},
-\DescPageRef{scrlttr2-experts.cmd.@newplength}. Setting pseudo-lengths to new
+\DescPageRef{scrlttr2-experts.cmd.newplength}. Setting pseudo-lengths to new
values should also be a matter for advanced users, so this is also described
-in the part for experts, on \DescPageRef{scrlttr2-experts.cmd.@setplength}.
+in the part for experts, on \DescPageRef{scrlttr2-experts.cmd.setplength}.
Note\textnote{Attention!} that although these pseudo-lengths are internally
implemented as macros, the commands to use pseudo-lengths expect only the the
@@ -1188,8 +1188,8 @@ this rule is determined by the
\PLength{fromrulewidth}\IndexPLength[indexmain]{fromrulewidth} pseudo-length.
\begin{table}
- \caption[{Available values of the \Option{fromrule} option with
- \Class{scrlttr2}}]{Available values of the \Option{fromrule} option for the
+ \caption[{Available values for the \Option{fromrule} option with
+ \Class{scrlttr2}}]{Available values for the \Option{fromrule} option for the
position of the rule in the sender information with
\Class{scrlttr2}}
\label{tab:\LabelBase.fromrule}
@@ -1571,8 +1571,8 @@ the basic \FontElement{addressee} configuration.%
\EndIndexGroup
%
\begin{table}
- \caption[{available values for the \Option{addrfield} option with
- \Class{scrlttr2}}]{available values for the \Option{addrfield} option to
+ \caption[{Available values for the \Option{addrfield} option with
+ \Class{scrlttr2}}]{Available values for the \Option{addrfield} option to
change the recipient format of \Class{scrlttr2}}%
\label{tab:\LabelBase.addrfield}%
\begin{desctabular}
@@ -1734,8 +1734,8 @@ You can find the default font styles listed in
\EndIndexGroup
\begin{table}
- \caption[{available values for the \Option{priority} option in
- \Class{scrlttr2}}]{available values for the \Option{priority} option to
+ \caption[{Available values for the \Option{priority} option in
+ \Class{scrlttr2}}]{Available values for the \Option{priority} option to
select the international priority in the address field of\Class{scrlttr2}}
\label{tab:\LabelBase.priority}
\begin{desctabular}
@@ -1853,8 +1853,8 @@ option are shown in \autoref{tab:\LabelBase.locfield}. The default is
\setcapindent{0pt}%
% \caption
\begin{captionbeside}
- [{Available values of the \Option{locfield} option with
- \Class{scrlttr2}}]{Available values of the \Option{locfield} option to
+ [{Available values for the \Option{locfield} option with
+ \Class{scrlttr2}}]{Available values for the \Option{locfield} option to
set the width of the field for extra sender information with
\Class{scrlttr2}%
\label{tab:\LabelBase.locfield}}%
@@ -1959,8 +1959,8 @@ additional data. Available values for this option are shown in
\PValue{dateright}\ChangedAt{v3.09}{\Class{scrlttr2}}.%
%
\begin{table}
- \caption[{Available values of the \Option{refline} option with
- \Class{scrlttr2}}]{Available value of the \Option{refline} option to set
+ \caption[{Available values for the \Option{refline} option with
+ \Class{scrlttr2}}]{Available values for the \Option{refline} option to set
the width of the reference line with \Class{scrlttr2}}
\label{tab:\LabelBase.refline}
\begin{desctabular}
@@ -1997,8 +1997,8 @@ starting on \DescPageRef{scrlttr2-experts.cmd.newkomavar}.%
\KOMAoptions{captions=topbeside}%
\setcapindent{0pt}%
% \caption
- \begin{captionbeside}[{default descriptions of variables in the
- reference line}]{default descriptions of typical variables in the
+ \begin{captionbeside}[{Default descriptions of variables in the
+ reference line}]{Default descriptions of typical variables in the
reference line using language-dependent commands}%
[l]
\begin{tabular}[t]{lll}
@@ -2035,7 +2035,7 @@ listed in \autoref{tab:\LabelBase.refnamerefvalue}.%
\setcapindent{0pt}%
% \caption
\begin{captionbeside}
- [{default font styles for elements in the reference line}]{default font
+ [{Default font styles for elements in the reference line}]{Default font
style settings for the elements in the reference line%
\label{tab:\LabelBase.refnamerefvalue}}
[l]
@@ -2178,7 +2178,7 @@ a colon followed by a space.
\KOMAoptions{captions=topbeside}%
\setcapindent{0pt}%
% \caption
- \begin{captionbeside}{default descriptions of variables for the subject}
+ \begin{captionbeside}{Default descriptions of variables for the subject}
[l]
\begin{tabular}[t]{lll}
\toprule
@@ -2216,8 +2216,8 @@ option, the whole subject must fit onto one line. The defaults are
\setcapindent{0pt}%
% \caption
\begin{captionbeside}
- [{Available values of the \Option{subject} option with \Class{scrlttr2}}]
- {Available values of the \Option{subject} option for the position and
+ [{Available values for the \Option{subject} option with \Class{scrlttr2}}]
+ {Available values for the \Option{subject} option for the position and
formatting of the subject with
\Class{scrlttr2}\label{tab:\LabelBase.subject}}%
[l]
@@ -2545,9 +2545,10 @@ positions simultaneously. Available values are listed in
\begin{table}
\caption[{Available values for the \Option{pagenumber} option with
- \Class{scrlttr2}}]{Available values of the \Option{pagenumber} option to
- position the page number in page styles \PageStyle{headings},
- \PageStyle{myheadings}, and \PValue{plain} with \Class{scrlttr2}}
+ \Class{scrlttr2}}]{Available values for the \Option{pagenumber} option to
+ position the page number in the \PageStyle{headings},
+ \PageStyle{myheadings}, and \PValue{plain} page styles with
+ \Class{scrlttr2}}
\label{tab:\LabelBase.pagenumber}
\begin{desctabular}
\entry{\PValue{bot}, \PValue{foot}}{%
@@ -2942,9 +2943,9 @@ In an \File{lco} file, you can use all commands available to the document at
the time the \File{lco} file is loaded. You can also use internal commands
available to package writers. For \Class{scrlttr2} and \Package{scrletter},
these are, in particular, the commands
-\DescRef{scrlttr2-experts.cmd.@newplength}\IndexCmd{@newplength},
-\DescRef{scrlttr2-experts.cmd.@setplength}\IndexCmd{@setplength}, and
-\DescRef{scrlttr2-experts.cmd.@setplength}\IndexCmd{@addtoplength} (see
+\DescRef{scrlttr2-experts.cmd.newplength}\IndexCmd{newplength},
+\DescRef{scrlttr2-experts.cmd.setplength}\IndexCmd{setplength}, and
+\DescRef{scrlttr2-experts.cmd.addtoplength}\IndexCmd{addtoplength} (see
\autoref{sec:scrlttr2-experts.pseudoLengths}).
\KOMAScript{} comes provided with some \File{lco} files. The \File{DIN.lco},
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 446e8fedd1a..36681ff6093 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
@@ -46,10 +46,10 @@
% ======================================================================
\KOMAProvidesFile{tocbasic.tex}
- [$Date: 2018-03-30 11:57:25 +0200 (Fri, 30 Mar 2018) $
+ [$Date: 2018-08-31 09:11:20 +0200 (Fri, 31 Aug 2018) $
KOMA-Script guide (package tocbasic)]
-% Date of the translated German file: 2018-03-27
+% Date of the translated German file: 2018-08-31
\translator{Markus Kohm\and Arndt Schubert\and Karl Hagen}
@@ -863,16 +863,19 @@ internal switch \Macro{@tempswa} globally!%
\begin{Declaration}
\Macro{DeclareTOCStyleEntry}\OParameter{option list}\Parameter{style}%
\Parameter{entry level}
+ \Macro{DeclareTOCStyleEntries}\OParameter{option list}\Parameter{style}%
+ \Parameter{entry level list}
\end{Declaration}
-This\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} command defines or
-configures the content-list entries of a given \PName{entry level}. The
-\PName{entry level} argument is a symbolic name, e.\,g. \PValue{section}, for
-the entry to the table of contents of the section level with the same name or
-\PValue{figure} for an entry of a figure to the list of figures. A
-\PName{style} is assigned to each \PName{entry level}. The \PName{style} has
-to be defined before using it as an argument of \Macro{DeclareTOCStyleEntry}.
-You can use the \PName{option list} to configure the various, usually
-\PName{style}-dependent, attributes of the entries.
+These\ChangedAt{v3.20}{\Package{tocbasic}} commands define or configure the
+content-list entries of a given \PName{entry level}. The \PName{entry level}
+argument is a symbolic name, e.\,g. \PValue{section}, for the entry to the
+table of contents of the section level with the same name or \PValue{figure}
+for an entry of a figure to the list of figures. A \PName{style} is assigned
+to each \PName{entry level}. The \PName{style} has to be defined before using
+it as an argument of \Macro{DeclareTOCStyleEntry} or
+\Macro{DeclareTOCStyleEntries}. You can use the \PName{option list} to
+configure the various, usually \PName{style}-dependent, attributes of the
+entries.
Currently, \Package{tocbasic} defines the following entry styles:
\begin{description}
@@ -1243,11 +1246,11 @@ Currently, \Package{tocbasic} defines the following entry styles:
\end{description}
You can find an explanation of the attributes of all styles that
\Package{tocbasic} defines in \autoref{tab:tocbasic.tocstyle.attributes}.
-If\ChangedAt[2016/06]{v3.21}{\Package{tocbasic}} you use these attributes as
+If\ChangedAt{v3.21}{\Package{tocbasic}} you use these attributes as
options to \DescRef{\LabelBase.cmd.DeclareNewTOC} (see
\DescPageRef{\LabelBase.cmd.DeclareNewTOC}), you must prefix the names of the
attribute by \PValue{tocentry}, e\,g. \PValue{level} becomes
-\Option{tocentrylevel}. If\ChangedAt[2015/12]{v3.20}{\Package{tocbasic}} use
+\Option{tocentrylevel}. If\ChangedAt{v3.20}{\Package{tocbasic}} use
these attributes as options for
\DescRef{maincls-experts.cmd.DeclareSectionCommand}%
\IndexCmd{DeclareSectionCommand}\IndexCmd{DeclareNewSectionCommand}%
@@ -1417,18 +1420,18 @@ Finally, using \Macro{DeclareTOCStyleEntry} will define the internal command
used.%
}%
\entry{\OptionVName{onstarthigherlevel}{code}}{%
- The \PValue{tocline} style can execute \PName{code} at the start of an entry,
- depending on whether the previous entry had numerical level greater than,
- the same as, or less than the current
- entry. The \PName{code} specified by this attribute will be executed if the
- current entry has a greater numerical value, i.\,e. it is
- lower in the entry hierarchy, than the previous one.
-
- Note that detecting the level of the previous entry only works so long as
+ The \PValue{tocline} style can execute \PName{code} at the start of an
+ entry, depending on whether the previous entry had numerical level greater
+ than, the same as, or less than the current entry. The \PName{code}
+ specified by this attribute will be executed if the current entry has a
+ greater numerical value, i.\,e. it is lower in the entry hierarchy, than
+ the previous one.
+
+ Note that detecting the level of the previous entry only works so long as
\Macro{lastpenalty} has not changed since the previous entry.
- The initial \PName{code} is \DescRef{\LabelBase.cmd.LastTOCLevelWasLower} (see
- \DescPageRef{\LabelBase.cmd.LastTOCLevelWasLower}).%
+ The initial \PName{code} is \DescRef{\LabelBase.cmd.LastTOCLevelWasLower}
+ (see \DescPageRef{\LabelBase.cmd.LastTOCLevelWasLower}).%
}%
\entry{\OptionVName{onstartlowerlevel}{code}}{%
The \PValue{tocline} style can execute \PName{code} at the start of an
@@ -1505,7 +1508,15 @@ Finally, using \Macro{DeclareTOCStyleEntry} will define the internal command
\DescRef{\LabelBase.cmd.TOCLineLeaderFill} for the \PValue{linefill}
attribute.%
}%
-\end{desclist}%
+\end{desclist}
+
+% New translation by Markus Kohm (please fix it!):
+\Macro{DeclareTOCStyleEntries}\ChangedAt{v3.26}{\Package{tocbasic}} uses
+\Macro{DeclareTOCStyleEntry} to define not only one \PName{entry level} but
+several entry levels. Each of the entry levels, given by the comma-separated
+\PName{entry level list}, is defined with the same \PName{style} and the
+settings of the given \PName{option list}.%
+% End of new translation.
%
\EndIndexGroup
@@ -1625,7 +1636,7 @@ is used to define the \Option{linefill} option. By specifying
\DescRef{\LabelBase.cmd.TOCLineLeaderFill} as the \PName{default value},
a call such as
\begin{lstcode}
- \RedeclareTOCStyleEntry[linefill]{tocline}{part}
+ \DeclareTOCStyleEntry[linefill]{tocline}{part}
\end{lstcode}
would, among other things, create the definition
\begin{lstcode}