summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/doc/english
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
committerKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
commit4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch)
tree968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/source/latex/koma-script/doc/english
parent59d9a998c6236de39603cb2ea077c5371e06b842 (diff)
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/doc/english')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/Makefile29
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-1.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-10.tex110
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-11.tex296
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-12.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-13.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-14.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-15.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-2.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-20.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-3.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-4.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-5.tex19
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-6.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-7.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex32
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex266
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/expertpart.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex8
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex7
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/introduction.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/japanlco.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/linkalias.tex11
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex46
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scraddr.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex205
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex226
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex126
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn-example.tex131
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn.tex929
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage-experts.tex312
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage.tex274
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex194
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlfile.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex8
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex75
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx6
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrpage2.tex1499
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrwfile.tex237
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex70
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/typearea-experts.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex37
46 files changed, 2230 insertions, 2967 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile b/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile
index 9ac3413dfaf..bb94aafa6c0 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile
@@ -1,6 +1,6 @@
# ======================================================================
# Makefile
-# Copyright (c) Markus Kohm, 2002-2012
+# Copyright (c) Markus Kohm, 2002-2014
#
# This file is part of the LaTeX2e KOMA-Script bundle.
#
@@ -18,7 +18,7 @@
# This work consists of all files listed in manifest.txt.
# ----------------------------------------------------------------------
# Makefile
-# Copyright (c) Markus Kohm, 2002-2012
+# Copyright (c) Markus Kohm, 2002-2014
#
# Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
# Version 1.3c, verteilt und/oder veraendert werden.
@@ -56,25 +56,10 @@ tocbasic.tex: ../../tocbasic.tex
cd ../.. && tex \\nonstopmode\\input $(basename $<)
# ----------------------------------------------------------------------
-# ----------------------------------------------------------------------
-# NOTE: Remove these rules after real translation of scrwfile.tex
-# is available.
-scrwfile.tex: ../../scrwfile.tex
- if [ -L $@ ] || ! [ -f $@ ]; then $(SYMLINK) $< .; else touch $@; fi
-
-../../scrwfile.tex: ../../scrwfile.dtx
- cd ../.. && tex \\nonstopmode\\input $(basename $<)
-# ----------------------------------------------------------------------
-
-# ----------------------------------------------------------------------
-# NOTE: Remove these rules after real translation of scrlayer-notecolumn.tex
-# is available.
-scrlayer-notecolumn.tex: ../../scrlayer-notecolumn.tex
- if [ -L $@ ] || ! [ -f $@ ]; then $(SYMLINK) $< .; else touch $@; fi
-
-../../scrlayer-notecolumn.tex: ../../scrlayer-notecolumn.dtx
- cd ../.. && tex \\nonstopmode\\input $(basename $<)
-# ----------------------------------------------------------------------
-
+maintainclean_local: distclean_local
+ $(RM) guide.pdf $(GUIDENAME).pdf $(GUIDENAME).html
+ [ -L tocbasic.tex ] && $(RM) tocbasic.tex || true
+ [ -L scrwfile.tex ] && $(RM) scrwfile.tex || true
+ [ -L scrlayer-notecolumn.tex ] && $(RM) scrlayer-notecolumn.tex || true
#
# end of file `Makefile'
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex
index deced1e00ca..67654e2ab97 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-0.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-1.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-1.tex
index 69e02610745..69a71991e4e 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-1.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-1.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-1.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-10.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-10.tex
deleted file mode 100644
index a3c209f6806..00000000000
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-10.tex
+++ /dev/null
@@ -1,110 +0,0 @@
-% ======================================================================
-% common-10.tex
-% Copyright (c) Markus Kohm, 2001-2013
-%
-% This file is part of the LaTeX2e KOMA-Script bundle.
-%
-% This work may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3c of the license.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later and of this work.
-%
-% This work has the LPPL maintenance status "author-maintained".
-%
-% The Current Maintainer and author of this work is Markus Kohm.
-%
-% This work consists of all files listed in manifest.txt.
-% ----------------------------------------------------------------------
-% common-10.tex
-% Copyright (c) Markus Kohm, 2001-2013
-%
-% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
-% Version 1.3c, verteilt und/oder veraendert werden.
-% Die neuste Version dieser Lizenz ist
-% http://www.latex-project.org/lppl.txt
-% und Version 1.3c ist Teil aller Verteilungen von LaTeX
-% Version 2005/12/01 oder spaeter und dieses Werks.
-%
-% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
-% (allein durch den Autor verwaltet).
-%
-% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm.
-%
-% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
-% ======================================================================
-%
-% Paragraphs that are common for several chapters of the KOMA-Script guide
-% Maintained by Markus Kohm
-%
-% ----------------------------------------------------------------------
-%
-% Absaetze, die mehreren Kapiteln der KOMA-Script-Anleitung gemeinsam sind
-% Verwaltet von Markus Kohm
-%
-% ======================================================================
-
-\KOMAProvidesFile{common-10.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
- KOMA-Script guide (common paragraphs)]
-\translator{Markus Kohm\and Krickette Murabayashi}
-
-% Date of the translated German file: 2012/01/01
-
-\makeatletter
-\@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}%
-\@ifundefined{ifCommonscrextend}{\newif\ifCommonscrextend}{}%
-\@ifundefined{ifCommonscrlttr}{\newif\ifCommonscrlttr}{}%
-\@ifundefined{ifIgnoreThis}{\newif\ifIgnoreThis}{}%
-\makeatother
-
-
-\ifIgnoreThis %+++++++++++++++++++++++++++++++++++++++++++++ nicht maincls +
-\else %------------------------------------------------------- nur maincls -
-\begin{Declaration}
- \Macro{footref}\Parameter{reference}
-\end{Declaration}
-\BeginIndex{Cmd}{footref}%
-Sometimes\ChangedAt{v3.00}{\Class{scrbook}\and \Class{scrreprt}\and
- \Class{scrartcl}\and \Class{scrlttr2}} there are single footnotes to
- multiple text passages. The least sensible way to typeset this would
-be to repeatedly use \Macro{footnotemark} with the same manually set
-number. The disadvantages of this method would be that you have to
-know the number and manually fix all the \Macro{footnotemark}
-commands, and if the number changes because of adding or removing a
-footnote before, each \Macro{footnotemark} would have to be
-changed. Because of this, \KOMAScript{} provides the use of the
-\Macro{label}\IndexCmd{label}\important{\Macro{label}} mechanism in
-such cases. After simply setting a \Macro{label} inside the footnote,
-\Macro{footref} may be used to mark all the other text passages with
-the same footnote mark.
-\begin{Example}
- Maybe you have to mark each trade name with a footnote which states that it
- is a registered trade name. You may write, e.\,g.,
-\begin{lstcode}
- Company SplishSplash\footnote{This is a registered trade name.
- All rights are reserved.\label{refnote}}
- produces not only SplishPlump\footref{refnote}
- but also SplishPlash\footref{refnote}.
-\end{lstcode}
- This will produce the same footnote mark three times, but only one footnote
- text. The first footnote mark is produced by \Macro{footnote}
- itself, and the following two footnote marks are produced by
- the additional \Macro{footref} commands. The footnote text will be produced by
- \Macro{footnote}.
-\end{Example}
-Because of setting the additional footnote marks using the \Macro{label}
-mechanism, changes of the footnote numbers will need at least two \LaTeX{}
-runs to ensure correct numbers for all \Macro{footref} marks.%
-%
-\EndIndex{Cmd}{footref}%
-\IfCommon{scrlttr2}{\EndIndex{}{footnotes}}
-\fi %**************************************************** Ende nur maincls *
-
-
-%%% Local Variables:
-%%% mode: latex
-%%% coding: us-ascii
-%%% TeX-master: "../guide"
-%%% End:
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-11.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-11.tex
deleted file mode 100644
index e4f3ebb325b..00000000000
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-11.tex
+++ /dev/null
@@ -1,296 +0,0 @@
-% ======================================================================
-% common-11.tex
-% Copyright (c) Markus Kohm, 2001-2013
-%
-% This file is part of the LaTeX2e KOMA-Script bundle.
-%
-% This work may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3c of the license.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later and of this work.
-%
-% This work has the LPPL maintenance status "author-maintained".
-%
-% The Current Maintainer and author of this work is Markus Kohm.
-%
-% This work consists of all files listed in manifest.txt.
-% ----------------------------------------------------------------------
-% common-11.tex
-% Copyright (c) Markus Kohm, 2001-2013
-%
-% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
-% Version 1.3c, verteilt und/oder veraendert werden.
-% Die neuste Version dieser Lizenz ist
-% http://www.latex-project.org/lppl.txt
-% und Version 1.3c ist Teil aller Verteilungen von LaTeX
-% Version 2005/12/01 oder spaeter und dieses Werks.
-%
-% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
-% (allein durch den Autor verwaltet).
-%
-% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm.
-%
-% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
-% ======================================================================
-%
-% Paragraphs that are common for several chapters of the KOMA-Script guide
-% Maintained by Markus Kohm
-%
-% ----------------------------------------------------------------------
-%
-% Absaetze, die mehreren Kapiteln der KOMA-Script-Anleitung gemeinsam sind
-% Verwaltet von Markus Kohm
-%
-% ======================================================================
-
-\KOMAProvidesFile{common-11.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
- KOMA-Script guide (common paragraphs)]
-\translator{Gernot Hassenpflug\and Markus Kohm}
-
-% Date of the translated German file: 2012/01/01
-
-\makeatletter
-\@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}%
-\@ifundefined{ifCommonscrextend}{\newif\ifCommonscrextend}{}%
-\@ifundefined{ifCommonscrlttr}{\newif\ifCommonscrlttr}{}%
-\@ifundefined{ifIgnoreThis}{\newif\ifIgnoreThis}{}%
-\makeatother
-
-
-\ifIgnoreThis %+++++++++++++++++++++++++++++++++++++++++++++ nicht maincls +
-\else %------------------------------------------------------- nur maincls -
-\begin{Declaration}
- \Macro{deffootnote}\OParameter{mark width}\Parameter{indent}%
- \Parameter{parindent}\Parameter{definition}\\
- \Macro{deffootnotemark}\Parameter{definition}\\
- \Macro{thefootnotemark}
-\end{Declaration}%
-\BeginIndex{Cmd}{deffootnote}%
-\BeginIndex{Cmd}{deffootnotemark}%
-\BeginIndex{Cmd}{thefootnotemark}%
-Footnotes are formatted slightly differently in {\KOMAScript} to in the
-standard classes. As in the standard classes the footnote mark in the text is
-depicted using a small superscripted number. The same formatting is used in
-the footnote itself. The mark in the footnote is type-set right-aligned in a
-box with width \PName{mark width}. The first line of the footnote follows
-directly.
-
-All following lines will be indented by the length of \PName{indent}. If the
-optional parameter \PName{mark width} is not specified, it defaults to
-\PName{indent}. If the footnote consists of more than one paragraph, then the
-first line of a paragraph is indented, in addition to \PName{indent}, by the
-value of \PName{parindent}.
-
-\hyperref[fig:maincls.deffootnote]{Figure~\ref*{fig:maincls.deffootnote}} %
-\IfCommon{scrlttr2}{at \autopageref{fig:maincls.deffootnote} }%
-illustrates the layout parameters. The default configuration of the
-{\KOMAScript} classes is:
-\begin{lstcode}
- \deffootnote[1em]{1.5em}{1em}
- {\textsuperscript{\thefootnotemark}}
-\end{lstcode}
-\Macro{textsuperscript} controls both the superscript and the smaller
-font size. Command \Macro{thefootnotemark} is the current footnote mark
-without any formatting.%
-\IfCommon{scrextend}{ % <-- Leerzeichen ist wichtig!
- Package \Package{scrextend} in contrast to this does not change the default
- footnote settings of the used class. Loading the package does not change any
- type style of footnote marks or footnote text in general. You have to copy
- the above shown source to use the default
- settings of the \KOMAScript{} classes with \Package{scrextend}. This may be
- done immediately after loading package \Package{scrextend}.}%
-
-\IfCommon{maincls}{%
-\begin{figure}
-% \centering
- \KOMAoption{captions}{bottombeside}
- \setcapindent{0pt}%
- \begin{captionbeside}
- [{Parameters that control the footnote layout}]%
- {\label{fig:maincls.deffootnote}\hspace{0pt plus 1ex}%
- Parameters that control the footnote layout}%
- [l]
- \setlength{\unitlength}{1mm}
- \begin{picture}(100,22)
- \thinlines
- % frame of following paragraph
- \put(5,0){\line(1,0){90}}
- \put(5,0){\line(0,1){5}}
- \put(10,5){\line(0,1){5}}\put(5,5){\line(1,0){5}}
- \put(95,0){\line(0,1){10}}
- \put(10,10){\line(1,0){85}}
- % frame of first paragraph
- \put(5,11){\line(1,0){90}}
- \put(5,11){\line(0,1){5}}
- \put(15,16){\line(0,1){5}}\put(5,16){\line(1,0){10}}
- \put(95,11){\line(0,1){10}}
- \put(15,21){\line(1,0){80}}
- % box of the footnote mark
- \put(0,16.5){\framebox(14.5,4.5){\mbox{}}}
- % description of paragraphs
- \put(45,16){\makebox(0,0)[l]{\textsf{first paragraph of a footnote}}}
- \put(45,5){\makebox(0,0)[l]{\textsf{next paragraph of a footnote}}}
- % help lines
- \thicklines
- \multiput(0,0)(0,3){7}{\line(0,1){2}}
- \multiput(5,0)(0,3){3}{\line(0,1){2}}
- % parameters
- \put(2,7){\vector(1,0){3}}
- \put(5,7){\line(1,0){5}}
- \put(15,7){\vector(-1,0){5}}
- \put(15,7){\makebox(0,0)[l]{\small\PName{parindent}}}
- %
- \put(-3,13){\vector(1,0){3}}
- \put(0,13){\line(1,0){5}}
- \put(10,13){\vector(-1,0){5}}
- \put(10,13){\makebox(0,0)[l]{\small\PName{indent}}}
- %
- \put(-3,19){\vector(1,0){3}}
- \put(0,19){\line(1,0){14.5}}
- \put(19.5,19){\vector(-1,0){5}}
- \put(19.5,19){\makebox(0,0)[l]{\small\PName{mark width}}}
- \end{picture}
- \end{captionbeside}
-\end{figure}}
-
-\BeginIndex{FontElement}{footnote}%
-\BeginIndex{FontElement}{footnotelabel}%
-The\ChangedAt{v2.8q}{%
- \Class{scrbook}\and\Class{scrreprt}\and\Class{scrartcl}} font element
-\FontElement{footnote}\important{\FontElement{footnote}} determines the font
-of the footnote including the footnote mark. Using the element
-\FontElement{footnotelabel}\important{\FontElement{footnotelabel}} the font of
-the footnote mark can be changed separately with the commands
-\Macro{setkomafont} and \Macro{addtokomafont} (see \autoref{sec:\csname
- label@base\endcsname.textmarkup}, \autopageref{desc:\csname
- label@base\endcsname.cmd.setkomafont}). Please refer also to
-\IfNotCommon{scrextend}{\autoref{tab:\csname
- label@base\endcsname.elementsWithoutText}, \autopageref{tab:\csname
- label@base\endcsname.elementsWithoutText}}%
-\IfCommon{scrextend}{\autoref{tab:maincls.elementsWithoutText},
- \autopageref{tab:maincls.elementsWithoutText}}%
-. Default setting is no change in the font.%
-\IfCommon{scrextend}{ % <-- Dieses Leerzeichen ist wichtig!
- With \Package{scrextend} the elements may change the fonts only if the
- footnotes are handled by the package, i.\,g., after using
- \Macro{deffootnote}.}
-
-\BeginIndex{FontElement}{footnotereference}%
-The footnote mark in the text is defined separately from the mark in
-front of the actual footnote. This is done with
-\Macro{deffootnotemark}. Default setting is:
-% Umbruchkorrektur: listings korrigieren!
-\begin{lstcode}[belowskip=\dp\strutbox]
- \deffootnotemark{%
- \textsuperscript{\thefootnotemark}}
-\end{lstcode}
-In the above\ChangedAt{v2.8q}{%
- \Class{scrbook}\and\Class{scrreprt}\and\Class{scrartcl}} the font
-for the element
-\FontElement{footnotereference}\important{\FontElement{footnotereference}} is
-applied (see %
-\IfNotCommon{scrextend}{\autoref{tab:\csname
- label@base\endcsname.elementsWithoutText}, \autopageref{tab:\csname
- label@base\endcsname.elementsWithoutText}}%
-\IfCommon{scrextend}{\autoref{tab:maincls.elementsWithoutText},
- \autopageref{tab:maincls.elementsWithoutText}}%
-). %
-Thus the footnote
-marks in the text and in the footnote itself are identical. The font
-can be changed with the commands \Macro{setkomafont} and
-\Macro{addtokomafont} (see \autoref{sec:\csname
- label@base\endcsname.textmarkup}, \autopageref{desc:\csname
- label@base\endcsname.cmd.setkomafont})%
-\IfCommon{scrextend}{ after usage of \Macro{deffootnotemark}}.
-
-\ifCommonscrlttr\else
-\begin{Example}
- \phantomsection\label{desc:maincls.cmd.deffootnote.example}%
- A\textnote{Hint!} feature often asked for is footnote marks which are
- neither in superscript nor in a smaller font size. They should not touch the
- footnote text but be separated by a small space. This can be accomplished as
- follows:
-\begin{lstcode}
- \deffootnote{1em}{1em}{\thefootnotemark\ }
-\end{lstcode}
- The footnote mark and the following space are therefore set
- right-aligned into a box of width 1\Unit{em}. The following lines of
- the footnote text are also indented by 1\Unit{em} from the left
- margin.
-
- Another\textnote{Hint!} often requested footnote layout is left-aligned
- footnote marks. These can be obtained with:
-\begin{lstcode}
- \deffootnote{1.5em}{1em}{%
- \makebox[1.5em][l]{\thefootnotemark}}
-\end{lstcode}
-
- If you want however only to change the font for all footnotes, for example
- to sans serif, you can solve this problem simply by using the commands
- \Macro{setkomafont} and \Macro{addtokomafont} (see
- \autoref{sec:maincls.textmarkup},
- \autopageref{desc:maincls.cmd.setkomafont}:
-\begin{lstcode}
- \setkomafont{footnote}{\sffamily}
-\end{lstcode}
-\end{Example}%
-\IfNotCommon{scrextend}{As demonstrated with the examples above, the simple
- user interface of {\KOMAScript} provides a great variety of different
- footnote formattings.}%
-\fi%
-\IfCommon{scrlttr2}{%
- Examples may be found at \autoref{sec:maincls.footnotes}, from
- \autopageref{desc:maincls.cmd.deffootnote} onwards.}%
-%
-\EndIndex{FontElement}{footnotereference}%
-\EndIndex{FontElement}{footnotelabel}%
-\EndIndex{FontElement}{footnote}%
-%
-\EndIndex{Cmd}{deffootnote}%
-\EndIndex{Cmd}{deffootnotemark}%
-\EndIndex{Cmd}{thefootnotemark}%
-
-
-\begin{Declaration}
- \Macro{setfootnoterule}\OParameter{thickness}\Parameter{length}%
-\end{Declaration}%
-\BeginIndex{Cmd}{setfootnoterule}%
-Generally\ChangedAt{v3.06}{\Class{scrlttr2}\and \Class{scrbook}\and
- \Class{scrreprt}\and \Class{scrartcl}\and \Package{scrextend}} a horizontal
-rule will be placed between the text area and the footnote area. But normally
-this rule is not as long as the width of the typing area. With Command
-\Macro{setfootnoterule} you may change the thickness and the width of that
-rule. Thereby the parameters \PName{thickness} and \PName{length} will be
-evaluated not at definition time but when setting the rule itself. If
-optional argument \PName{thickness} ha been omitted the thickness of the rule
-will not be changed. Empty arguments \PName{thickness} or \PName{length} are
-also allowed and do not change the corresponding parameter. Using implausible
-values may result in warning messages not only setting the arguments but also
-when \KOMAScript{} uses the parameters.
-
-\BeginIndex{FontElement}{footnoterule}%
-With element \FontElement{footnoterule}\important{\FontElement{footnoterule}}
-the color \ChangedAt{v3.07}{\Class{scrlttr2}\and \Class{scrbook}\and
- \Class{scrreprt}\and \Class{scrartcl}\and \Package{scrextend}} of the rule
-may be changed using the commands \Macro{setkomafont} and
-\Macro{addtokomafont} (see \autoref{sec:\csname
- label@base\endcsname.textmarkup}, \autopageref{desc:\csname
- label@base\endcsname.cmd.setkomafont}). Default is no change of font or
-color. For color changes a color package like
-\Package{xcolor}\IndexPackage{xcolor}\important{\Package{xcolor}} would be
-needed.%
-%
-\EndIndex{FontElement}{footnoterule}%
-\EndIndex{Cmd}{setfootnoterule}%
-\IfNotCommon{scrlttr2}{\EndIndex{}{footnotes}}
-\fi %**************************************************** Ende nur maincls *
-
-
-%%% Local Variables:
-%%% mode: latex
-%%% coding: us-ascii
-%%% TeX-master: "../guide"
-%%% End:
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-12.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-12.tex
index a567512ef83..fa348248446 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-12.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-12.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-12.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-13.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-13.tex
index e4f69fb2f48..bfba10f0fd7 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-13.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-13.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-13.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-14.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-14.tex
index 15f222f283b..41e7e6e4e09 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-14.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-14.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-14.tex}
- [$Date: 2013-11-21 16:13:48 +0100 (Do, 21. Nov 2013) $
+ [$Date: 2013-11-21 16:13:48 +0100 (Thu, 21 Nov 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-15.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-15.tex
index ff61582d756..8772357d8ef 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-15.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-15.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-15.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-2.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-2.tex
index 8ac590a8100..9c147bfa52d 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-2.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-2.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-2.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Markus Kohm\and Gernot Hassenpflug\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-20.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-20.tex
index 85fdea3b1a8..6f3125f0dc8 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-20.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-20.tex
@@ -46,7 +46,7 @@
% ============================================================================
\KOMAProvidesFile{common-20.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraph: Head and Foot Height)]
\translator{Markus Kohm\and Jana Schubert\and Jens H\"uhne}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-3.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-3.tex
index a747b1f68e2..896b13fe57a 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-3.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-3.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-3.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-4.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-4.tex
index 8388bc8a938..30d7f268813 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-4.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-4.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-4.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraphs)]
\translator{Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-5.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-5.tex
index fea58a3a5ee..f1617a84f6c 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-5.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-5.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-5.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% common-5.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,11 +46,11 @@
% ======================================================================
\KOMAProvidesFile{common-5.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi}
-% Date of the translated German file: 2013/07/31
+% Date of the translated German file: 2014/06/25
\makeatletter
\@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}%
@@ -314,9 +314,9 @@ the font style of the selected \PName{element}.
\feentry{minisec}{title of \Macro{minisec} (see
\autoref{sec:maincls.structure} ab
\autopageref{desc:maincls.cmd.minisec})}%
- \feentry{pagefoot}{only used if package \Package{scrpage2} has been loaded
- (see \autoref{cha:scrpage},
- \autopageref{desc:scrpage.fontelement.pagefoot})}%
+ \feentry{pagefoot}{only used if package \Package{scrlayer-scrpage} has been
+ loaded (see \autoref{cha:scrlayer-scrpage},
+ \autopageref{desc:scrlayer-scrpage.fontelement.pagefoot})}%
\feentry{pagehead}{another name for \FontElement{pageheadfoot}}%
\feentry{pageheadfoot}{the head of a page, but also the foot of a page (see
\autoref{sec:maincls.pagestyle} ab \autopageref{sec:maincls.pagestyle})}%
@@ -468,8 +468,9 @@ may be found in \autoref{sec:maincls.textmarkup} at
\feentry{pagefoot}{%
used after element \FontElement{pageheadfoot} for the page foot, that has
been defined with variable \Variable{nextfoot}\IndexVariable{nextfoot}, or
- for the page foot of package \Package{scrpage2} %
- (\autoref{cha:scrpage}, \autopageref{desc:scrpage.fontelement.pagefoot})}%
+ for the page foot of package \Package{scrlayer-scrpage} %
+ (\autoref{cha:scrlayer-scrpage},
+ \autopageref{desc:scrlayer-scrpage.fontelement.pagefoot})}%
\feentry{pagehead}{%
another name for \FontElement{pageheadfoot}}%
\feentry{pageheadfoot}{%
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-6.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-6.tex
index 9636b3eb4c1..0ff00dbe865 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-6.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-6.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-6.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraph: Paragraph Markup)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-7.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-7.tex
index 3648bf1abb6..4f17014ad69 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-7.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-7.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-7.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (common paragraph: Detection of Odd and
Even Pages)]
\translator{Markus Kohm\and Krickette Murabayashi}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex
index 29eb6a19a78..5e67cfaa043 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-8.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% common-8.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,11 +46,11 @@
% ======================================================================
\KOMAProvidesFile{common-8.tex}%
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $
KOMA-Script guide (common paragraphs: Interleaf Pages)]
\translator{Markus Kohm\and Gernot Hassenpflug\and Krickette Murabayashi}
-% Date of the translated German file: 2013/11/07
+% Date of the translated German file: 2014/06/25
\makeatletter
\@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}%
@@ -111,17 +111,17 @@ interleaf pages created by the \Macro{cleardoublepage} to break until the
wanted page. Every already defined \PName{page style} (see
\autoref{sec:\csname label@base\endcsname.pagestyle} from
\autopageref{sec:\csname label@base\endcsname.pagestyle} and
-\autoref{cha:scrpage} from \autopageref{cha:scrpage}) may be used. Besides this,
-\OptionValue{cleardoublepage}{current} is valid. This case is the default
-until \KOMAScript~2.98c and results in interleaf page without changing the
-page style. Since \KOMAScript~3.00\ChangedAt{v3.00}{\Class{scrbook}\and
- \Class{scrreprt}\and \Class{scrartcl}\and \Class{scrlttr2}} the default
-follows the recommendation of most typographers and has been changed to blank
-interleaf pages with page style \Pagestyle{empty} unless you switch
-compatibility to an earlier version (see option \Option{version},
-\autoref{sec:\csname label@base\endcsname.compatibilityOptions},
-\autopageref{desc:\csname label@base\endcsname.option.version}).
-\ifCommonmaincls
+\autoref{cha:scrlayer-scrpage} from \autopageref{cha:scrlayer-scrpage}) may be
+used. Besides this, \OptionValue{cleardoublepage}{current} is valid. This case
+is the default until \KOMAScript~2.98c and results in interleaf page without
+changing the page style. Since
+\KOMAScript~3.00\ChangedAt{v3.00}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}\and \Class{scrlttr2}} the default follows the
+recommendation of most typographers and has been changed to blank interleaf
+pages with page style \Pagestyle{empty} unless you switch compatibility to an
+earlier version (see option \Option{version}, \autoref{sec:\csname
+ label@base\endcsname.compatibilityOptions}, \autopageref{desc:\csname
+ label@base\endcsname.option.version}). \ifCommonmaincls
\begin{Example}
\phantomsection\label{desc:maincls.option.cleardoublepage.example}
Assume you want interleaf pages almost empty but with pagination. This
@@ -203,7 +203,7 @@ as the \IfNotCommon{scrlttr2}{running}\IfCommon{scrlttr2}{page} head. The page
is thus entirely empty. If another \PName{page style} is wanted for the
interleaf page is may be set with the argument of
\Macro{cleardoubleoddusingpagestyle}. Every already defined \PName{page style}
-(see \autoref{cha:scrpage}) may be used.
+(see \autoref{cha:scrlayer-scrpage}) may be used.
\IfNotCommon{scrlttr2}{%
Sometimes chapters should not start on the right-hand page but the
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex
index 408de83c117..ef4048f5e0b 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-9.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-01-14 17:52:03 +0100 (Tue, 14 Jan 2014) $
KOMA-Script guide (common paragraphs: Footnotes)]
\translator{Markus Kohm\and Krickette Murabayashi}
@@ -223,6 +223,270 @@ and may be changed by redefining the command.
\EndIndex{Cmd}{footnotetext}%
\EndIndex{Cmd}{multiplefootnoteseparator}%
\EndIndex{Cmd}{multfootsep}%
+
+\begin{Declaration}
+ \Macro{footref}\Parameter{reference}
+\end{Declaration}
+\BeginIndex{Cmd}{footref}%
+Sometimes\ChangedAt{v3.00}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}\and \Class{scrlttr2}} there are single footnotes to
+ multiple text passages. The least sensible way to typeset this would
+be to repeatedly use \Macro{footnotemark} with the same manually set
+number. The disadvantages of this method would be that you have to
+know the number and manually fix all the \Macro{footnotemark}
+commands, and if the number changes because of adding or removing a
+footnote before, each \Macro{footnotemark} would have to be
+changed. Because of this, \KOMAScript{} provides the use of the
+\Macro{label}\IndexCmd{label}\important{\Macro{label}} mechanism in
+such cases. After simply setting a \Macro{label} inside the footnote,
+\Macro{footref} may be used to mark all the other text passages with
+the same footnote mark.
+\begin{Example}
+ Maybe you have to mark each trade name with a footnote which states that it
+ is a registered trade name. You may write, e.\,g.,
+\begin{lstcode}
+ Company SplishSplash\footnote{This is a registered trade name.
+ All rights are reserved.\label{refnote}}
+ produces not only SplishPlump\footref{refnote}
+ but also SplishPlash\footref{refnote}.
+\end{lstcode}
+ This will produce the same footnote mark three times, but only one footnote
+ text. The first footnote mark is produced by \Macro{footnote}
+ itself, and the following two footnote marks are produced by
+ the additional \Macro{footref} commands. The footnote text will be produced by
+ \Macro{footnote}.
+\end{Example}
+Because of setting the additional footnote marks using the \Macro{label}
+mechanism, changes of the footnote numbers will need at least two \LaTeX{}
+runs to ensure correct numbers for all \Macro{footref} marks.%
+%
+\EndIndex{Cmd}{footref}%
+\begin{Declaration}
+ \Macro{deffootnote}\OParameter{mark width}\Parameter{indent}%
+ \Parameter{parindent}\Parameter{definition}\\
+ \Macro{deffootnotemark}\Parameter{definition}\\
+ \Macro{thefootnotemark}
+\end{Declaration}%
+\BeginIndex{Cmd}{deffootnote}%
+\BeginIndex{Cmd}{deffootnotemark}%
+\BeginIndex{Cmd}{thefootnotemark}%
+Footnotes are formatted slightly differently in {\KOMAScript} to in the
+standard classes. As in the standard classes the footnote mark in the text is
+depicted using a small superscripted number. The same formatting is used in
+the footnote itself. The mark in the footnote is type-set right-aligned in a
+box with width \PName{mark width}. The first line of the footnote follows
+directly.
+
+All following lines will be indented by the length of \PName{indent}. If the
+optional parameter \PName{mark width} is not specified, it defaults to
+\PName{indent}. If the footnote consists of more than one paragraph, then the
+first line of a paragraph is indented, in addition to \PName{indent}, by the
+value of \PName{parindent}.
+
+\hyperref[fig:maincls.deffootnote]{Figure~\ref*{fig:maincls.deffootnote}} %
+\IfCommon{scrlttr2}{at \autopageref{fig:maincls.deffootnote} }%
+illustrates the layout parameters. The default configuration of the
+{\KOMAScript} classes is:
+\begin{lstcode}
+ \deffootnote[1em]{1.5em}{1em}
+ {\textsuperscript{\thefootnotemark}}
+\end{lstcode}
+\Macro{textsuperscript} controls both the superscript and the smaller
+font size. Command \Macro{thefootnotemark} is the current footnote mark
+without any formatting.%
+\IfCommon{scrextend}{ % <-- Leerzeichen ist wichtig!
+ Package \Package{scrextend} in contrast to this does not change the default
+ footnote settings of the used class. Loading the package does not change any
+ type style of footnote marks or footnote text in general. You have to copy
+ the above shown source to use the default
+ settings of the \KOMAScript{} classes with \Package{scrextend}. This may be
+ done immediately after loading package \Package{scrextend}.}%
+
+\IfCommon{maincls}{%
+\begin{figure}
+% \centering
+ \KOMAoption{captions}{bottombeside}
+ \setcapindent{0pt}%
+ \begin{captionbeside}
+ [{Parameters that control the footnote layout}]%
+ {\label{fig:maincls.deffootnote}\hspace{0pt plus 1ex}%
+ Parameters that control the footnote layout}%
+ [l]
+ \setlength{\unitlength}{1mm}
+ \begin{picture}(100,22)
+ \thinlines
+ % frame of following paragraph
+ \put(5,0){\line(1,0){90}}
+ \put(5,0){\line(0,1){5}}
+ \put(10,5){\line(0,1){5}}\put(5,5){\line(1,0){5}}
+ \put(95,0){\line(0,1){10}}
+ \put(10,10){\line(1,0){85}}
+ % frame of first paragraph
+ \put(5,11){\line(1,0){90}}
+ \put(5,11){\line(0,1){5}}
+ \put(15,16){\line(0,1){5}}\put(5,16){\line(1,0){10}}
+ \put(95,11){\line(0,1){10}}
+ \put(15,21){\line(1,0){80}}
+ % box of the footnote mark
+ \put(0,16.5){\framebox(14.5,4.5){\mbox{}}}
+ % description of paragraphs
+ \put(45,16){\makebox(0,0)[l]{\textsf{first paragraph of a footnote}}}
+ \put(45,5){\makebox(0,0)[l]{\textsf{next paragraph of a footnote}}}
+ % help lines
+ \thicklines
+ \multiput(0,0)(0,3){7}{\line(0,1){2}}
+ \multiput(5,0)(0,3){3}{\line(0,1){2}}
+ % parameters
+ \put(2,7){\vector(1,0){3}}
+ \put(5,7){\line(1,0){5}}
+ \put(15,7){\vector(-1,0){5}}
+ \put(15,7){\makebox(0,0)[l]{\small\PName{parindent}}}
+ %
+ \put(-3,13){\vector(1,0){3}}
+ \put(0,13){\line(1,0){5}}
+ \put(10,13){\vector(-1,0){5}}
+ \put(10,13){\makebox(0,0)[l]{\small\PName{indent}}}
+ %
+ \put(-3,19){\vector(1,0){3}}
+ \put(0,19){\line(1,0){14.5}}
+ \put(19.5,19){\vector(-1,0){5}}
+ \put(19.5,19){\makebox(0,0)[l]{\small\PName{mark width}}}
+ \end{picture}
+ \end{captionbeside}
+\end{figure}}
+
+\BeginIndex{FontElement}{footnote}%
+\BeginIndex{FontElement}{footnotelabel}%
+The\ChangedAt{v2.8q}{%
+ \Class{scrbook}\and\Class{scrreprt}\and\Class{scrartcl}} font element
+\FontElement{footnote}\important{\FontElement{footnote}} determines the font
+of the footnote including the footnote mark. Using the element
+\FontElement{footnotelabel}\important{\FontElement{footnotelabel}} the font of
+the footnote mark can be changed separately with the commands
+\Macro{setkomafont} and \Macro{addtokomafont} (see \autoref{sec:\csname
+ label@base\endcsname.textmarkup}, \autopageref{desc:\csname
+ label@base\endcsname.cmd.setkomafont}). Please refer also to
+\IfNotCommon{scrextend}{\autoref{tab:\csname
+ label@base\endcsname.elementsWithoutText}, \autopageref{tab:\csname
+ label@base\endcsname.elementsWithoutText}}%
+\IfCommon{scrextend}{\autoref{tab:maincls.elementsWithoutText},
+ \autopageref{tab:maincls.elementsWithoutText}}%
+. Default setting is no change in the font.%
+\IfCommon{scrextend}{ % <-- Dieses Leerzeichen ist wichtig!
+ With \Package{scrextend} the elements may change the fonts only if the
+ footnotes are handled by the package, i.\,g., after using
+ \Macro{deffootnote}.}
+
+\BeginIndex{FontElement}{footnotereference}%
+The footnote mark in the text is defined separately from the mark in
+front of the actual footnote. This is done with
+\Macro{deffootnotemark}. Default setting is:
+% Umbruchkorrektur: listings korrigieren!
+\begin{lstcode}[belowskip=\dp\strutbox]
+ \deffootnotemark{%
+ \textsuperscript{\thefootnotemark}}
+\end{lstcode}
+In the above\ChangedAt{v2.8q}{%
+ \Class{scrbook}\and\Class{scrreprt}\and\Class{scrartcl}} the font
+for the element
+\FontElement{footnotereference}\important{\FontElement{footnotereference}} is
+applied (see %
+\IfNotCommon{scrextend}{\autoref{tab:\csname
+ label@base\endcsname.elementsWithoutText}, \autopageref{tab:\csname
+ label@base\endcsname.elementsWithoutText}}%
+\IfCommon{scrextend}{\autoref{tab:maincls.elementsWithoutText},
+ \autopageref{tab:maincls.elementsWithoutText}}%
+). %
+Thus the footnote
+marks in the text and in the footnote itself are identical. The font
+can be changed with the commands \Macro{setkomafont} and
+\Macro{addtokomafont} (see \autoref{sec:\csname
+ label@base\endcsname.textmarkup}, \autopageref{desc:\csname
+ label@base\endcsname.cmd.setkomafont})%
+\IfCommon{scrextend}{ after usage of \Macro{deffootnotemark}}.
+
+\ifCommonscrlttr\else
+\begin{Example}
+ \phantomsection\label{desc:maincls.cmd.deffootnote.example}%
+ A\textnote{Hint!} feature often asked for is footnote marks which are
+ neither in superscript nor in a smaller font size. They should not touch the
+ footnote text but be separated by a small space. This can be accomplished as
+ follows:
+\begin{lstcode}
+ \deffootnote{1em}{1em}{\thefootnotemark\ }
+\end{lstcode}
+ The footnote mark and the following space are therefore set
+ right-aligned into a box of width 1\Unit{em}. The following lines of
+ the footnote text are also indented by 1\Unit{em} from the left
+ margin.
+
+ Another\textnote{Hint!} often requested footnote layout is left-aligned
+ footnote marks. These can be obtained with:
+\begin{lstcode}
+ \deffootnote{1.5em}{1em}{%
+ \makebox[1.5em][l]{\thefootnotemark}}
+\end{lstcode}
+
+ If you want however only to change the font for all footnotes, for example
+ to sans serif, you can solve this problem simply by using the commands
+ \Macro{setkomafont} and \Macro{addtokomafont} (see
+ \autoref{sec:maincls.textmarkup},
+ \autopageref{desc:maincls.cmd.setkomafont}:
+\begin{lstcode}
+ \setkomafont{footnote}{\sffamily}
+\end{lstcode}
+\end{Example}%
+\IfNotCommon{scrextend}{As demonstrated with the examples above, the simple
+ user interface of {\KOMAScript} provides a great variety of different
+ footnote formattings.}%
+\fi%
+\IfCommon{scrlttr2}{%
+ Examples may be found at \autoref{sec:maincls.footnotes}, from
+ \autopageref{desc:maincls.cmd.deffootnote} onwards.}%
+%
+\EndIndex{FontElement}{footnotereference}%
+\EndIndex{FontElement}{footnotelabel}%
+\EndIndex{FontElement}{footnote}%
+%
+\EndIndex{Cmd}{deffootnote}%
+\EndIndex{Cmd}{deffootnotemark}%
+\EndIndex{Cmd}{thefootnotemark}%
+
+
+\begin{Declaration}
+ \Macro{setfootnoterule}\OParameter{thickness}\Parameter{length}%
+\end{Declaration}%
+\BeginIndex{Cmd}{setfootnoterule}%
+Generally\ChangedAt{v3.06}{\Class{scrlttr2}\and \Class{scrbook}\and
+ \Class{scrreprt}\and \Class{scrartcl}\and \Package{scrextend}} a horizontal
+rule will be placed between the text area and the footnote area. But normally
+this rule is not as long as the width of the typing area. With Command
+\Macro{setfootnoterule} you may change the thickness and the width of that
+rule. Thereby the parameters \PName{thickness} and \PName{length} will be
+evaluated not at definition time but when setting the rule itself. If
+optional argument \PName{thickness} ha been omitted the thickness of the rule
+will not be changed. Empty arguments \PName{thickness} or \PName{length} are
+also allowed and do not change the corresponding parameter. Using implausible
+values may result in warning messages not only setting the arguments but also
+when \KOMAScript{} uses the parameters.
+
+\BeginIndex{FontElement}{footnoterule}%
+With element \FontElement{footnoterule}\important{\FontElement{footnoterule}}
+the color \ChangedAt{v3.07}{\Class{scrlttr2}\and \Class{scrbook}\and
+ \Class{scrreprt}\and \Class{scrartcl}\and \Package{scrextend}} of the rule
+may be changed using the commands \Macro{setkomafont} and
+\Macro{addtokomafont} (see \autoref{sec:\csname
+ label@base\endcsname.textmarkup}, \autopageref{desc:\csname
+ label@base\endcsname.cmd.setkomafont}). Default is no change of font or
+color. For color changes a color package like
+\Package{xcolor}\IndexPackage{xcolor}\important{\Package{xcolor}} would be
+needed.%
+%
+\EndIndex{FontElement}{footnoterule}%
+\EndIndex{Cmd}{setfootnoterule}%
+\EndIndex{}{footnotes}%
+
+
\fi %**************************************************** Ende nur maincls *
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/expertpart.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/expertpart.tex
index b8ba50618ee..c78834a1baf 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/expertpart.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/expertpart.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{expertpart.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
Part KOMA-Script for Experts]
\translator{Markus Kohm}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex
index 947254a3ce5..bec834af42c 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex
@@ -1,6 +1,6 @@
% ======================================================================
% guide-english.tex
-% Copyright (c) Markus Kohm, 2002-2013
+% Copyright (c) Markus Kohm, 2002-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% guide-english.tex
-% Copyright (c) Markus Kohm, 2002-2013
+% Copyright (c) Markus Kohm, 2002-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -45,7 +45,7 @@
%
% ======================================================================
%
-\ProvidesFile{guide-english.tex}[{2013/08/05
+\ProvidesFile{guide-english.tex}[{2014/06/25
KOMA-Script guide language dependencies}]
%
% \section{Extra Packages}
@@ -142,7 +142,7 @@
% The term ``counter''.
% \begin{macrocode}
\newcommand*{\GuideCounter}{counter}
-\newcommand*{\GuideCounterExpanded}{counters}
+\newcommand*{\GuideCounterIndexCategory}{counters}
\let\GuideCounterIndexCategoryExpanded\GuideCounterIndexCategory
% \end{macrocode}
% \end{macro}
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 41ba9402133..ae9ac2f1d1d 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
@@ -1,6 +1,6 @@
% ======================================================================
% guide.tex
-% Copyright (c) Markus Kohm, 2002-2012
+% Copyright (c) Markus Kohm, 2002-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% guide.tex
-% Copyright (c) Markus Kohm, 2002-2012
+% Copyright (c) Markus Kohm, 2002-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -45,7 +45,7 @@
%
% ======================================================================
-\ProvidesFile{guide.tex}[2013/10/14 KOMA-Script guide main file]
+\ProvidesFile{guide.tex}[2014/06/25 KOMA-Script guide main file]
\documentclass[\languagename]{scrguide}
@@ -94,7 +94,6 @@
\include{typearea}
\include{scrbookreportarticle}
\include{scrlttr2}
-\include{scrpage2}
\include{scrlayer-scrpage}
\include{scrdatetime}
\include{scraddr}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/introduction.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/introduction.tex
index 28569628ad8..0c86ecc56ab 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/introduction.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/introduction.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{introduction.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide introduction]
\translator{Kevin Pfeiffer\and Gernot Hassenpflug\and
Krickette Murabayashi\and Markus Kohm}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/japanlco.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/japanlco.tex
index 54a6d3f0782..03e6c32d972 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/japanlco.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/japanlco.tex
@@ -50,7 +50,7 @@
%
\KOMAProvidesFile{japanlco.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (appendix: japanlco)]
\appendix
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 0c19526f10e..cfcc44aa11c 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-2012
+% Copyright (c) Markus Kohm, 2008-2014
%
% 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-2012
+% Copyright (c) Markus Kohm, 2008-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -38,7 +38,7 @@
% Link Aliase, die für die freie Version der Anleitung benötigt werden.
%
-\ProvidesFile{linkalias.tex}[2012/02/16 link aliases for the free version]
+\ProvidesFile{linkalias.tex}[2014/03/18 link aliases for the free version]
\makeatletter
\newcommand*{\lalias}[2]{%
@@ -65,3 +65,8 @@
\lalias{desc:scrlttr2.cmd.setfootnoterule}{desc:maincls.cmd.setfootnoterule}
\lalias{desc:scrlttr2.env.description}{desc:maincls.env.description}
\lalias{desc:scrlttr2.env.labeling}{desc:maincls.env.labeling}
+
+\lalias{desc:scrlayer-scrpage.cmd.setkomafont}{desc:maincls.cmd.setkomafont}
+\lalias{desc:scrlayer.cmd.automark}{desc:scrlayer-scrpage.cmd.automark}
+\lalias{desc:scrlayer.cmd.chaptermark}{desc:scrlayer-scrpage.cmd.chaptermark}
+\lalias{desc:scrlayer-scrpage-experts.cmd.automark}{desc:scrlayer-scrpage.cmd.automark}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex
index f98815f546b..306ed11479c 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex
@@ -1,6 +1,6 @@
% ======================================================================
% preface.tex
-% Copyright (c) Markus Kohm, 2008-2013
+% Copyright (c) Markus Kohm, 2008-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% preface.tex
-% Copyright (c) Markus Kohm, 2008-2013
+% Copyright (c) Markus Kohm, 2008-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -36,42 +36,32 @@
% ======================================================================
\KOMAProvidesFile{preface.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-10-21 08:31:54 +0200 (Tue, 21 Oct 2014) $
Preface to the KOMA-Script book]
%\translator{Markus Kohm}
% Date of the translated German file: 0000/00/00
-\addchap{Preface to new English \KOMAScript{} Guide}
+\addchap{Preface to the English \KOMAScript{} Guide}
-This is not a translation of the preface of the German \KOMAScript{} guide,
-because this translation of the German \KOMAScript{} guide is still a work in
-progress. Currently the chapters of \autoref{part:forAuthors} and
-\autoref{cha:scrbase}, \autoref{cha:scrlfile}, \autoref{cha:scrhack},
-\autoref{cha:scrlayer}, \autoref{cha:scrlayer-scrpage-experts},
-\autoref{cha:typearea-experts}, \autoref{cha:maincls-experts},
-\autoref{cha:scrlttr2-experts} are up-to-date.
+The translation of the German \KOMAScript{} guide is still a work in
+progress. Currently almost all chapters are up-to-date.
-Nevertheless, for \autoref{cha:scrlayer}, \autoref{cha:scrlayer-scrpage},
-\autoref{cha:scrlayer-scrpage-experts} a native speaker or someone with
-advanced knowledge of the English language would be needed to improve it.
-% AFAIK currently there are not any dead links or broken references, otherwise
-% I would use the following:
-% There may still be dead links and broken references in these chapters,
-% because the referenced information in chapters of other parts could be
-% missing.
+\hyperref[cha:tocbasic]{Chapter~\ref*{cha:tocbasic}} is not a translation from
+the German manual but the primary description from the implementation of the
+package. Nevertheless the chapter in the German manual is more detailed. A
+native or very advanced English speaker with basic TeX knowledge is urgently
+needed to translate the German text.
-The descriptions in \autoref{cha:scrwfile}, \autoref{cha:tocbasic},
-\autoref{cha:scrlayer-notecolumn} are not translations from the German manual
-but are primary descriptions from the implementation of these packages. They
-should be up-to-date\,---\,sometimes even more than the chapters from the
-German manual.
+A real gap is the chapter about \Package{scrjura}. Currently there isn't such
+a chapter, neither in the German nor in the English manual. But there is a
+chapter at the German \KOMAScript{} book. If someone would translate it, I
+would add this chapter and the translation to the manuals.
So this English guide is complete but nevertheless not as good as the German
-one, because my English is not as good as my German. Currently there's only
-one editor for the English guide, Krickette Murabayashi, who improves my
-translation for free. Many thanks to her for her very good job! Nevertheless,
-additional editors or translators would be welcome!
+one. Currently there are only a few editors for the English guide, who improve
+my translation for free. Many thanks to them for their very good job!
+Nevertheless, additional editors or translators would be welcome!
\endinput
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scraddr.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scraddr.tex
index 3c383597324..5753da82988 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scraddr.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scraddr.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{scraddr.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (chapter: scraddr)]
\translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm}
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 376319b4d06..78454dbe73b 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
@@ -1,6 +1,6 @@
% ======================================================================
% scrbase.tex
-% Copyright (c) Markus Kohm, 2002-2013
+% Copyright (c) Markus Kohm, 2002-2014
%
% 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-2013
+% Copyright (c) Markus Kohm, 2002-2014
%
% 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: 2013-12-13 16:32:18 +0100 (Fr, 13 Dez 2013) $
+ [$Date: 2014-09-19 10:04:02 +0200 (Fri, 19 Sep 2014) $
KOMA-Script package scrbase]
\translator{Markus Kohm\and Melvin Hendrix}
-% Date of the translated German file: 2013/11/06
+% Date of the translated German file: 2014/09/19
\chapter{Basic Functions of Package \Package{scrbase}}
\labelbase{scrbase}
@@ -270,8 +270,8 @@ Generally, the four predefined states should be sufficient.
\begin{lstcode}
\newif\if@Salami@Aufschnitt
\DefineFamilyKey{butcher}%
- {coldcut}[true]{%
- \expandafter\let\expandafter\if@salami@coldcut
+ {coldcuts}[true]{%
+ \expandafter\let\expandafter\if@salami@coldcuts
\csname if#1\endcsname
\FamilyKeyStateProcessed
}
@@ -315,7 +315,7 @@ the keys of the family members.
\begin{lstcode}
\FamilyProcessOptions{butcher}
\end{lstcode}
- then the user may select the option \Option{coldcut} when loading the
+ then the user may select the option \Option{coldcuts} when loading the
package. If the option is used globally, this means at the optional
argument of \Macro{documentclass}, then the option would be passed
automatically to all three packages, if all three packages are loaded
@@ -350,10 +350,10 @@ Somehow special are keys of empty family members, which are not attached to a
family member, but to a family. Such keys are set before the keys of family
members.
\begin{Example}
- Assume option \Option{coldcut} should be set by default in the
+ Assume option \Option{coldcuts} should be set by default in the
previous example. In this case only line
\begin{lstcode}
- \FamilyExecuteOptions{butcher}{coldcut}
+ \FamilyExecuteOptions{butcher}{coldcuts}
\end{lstcode}
has to be added.
\end{Example}
@@ -385,34 +385,45 @@ family, then \Macro{FamilyOptions} will result in an error. Package
\PName{key}, but all those members signal failure via \Macro{FamilyKeyState}.
\begin{Example}
You extend your butcher project by a package \Package{sausagesalad}. If this
- package has been loaded, all sausage package should generate cold cut:
+ package has been loaded, all sausage package should generate cold cuts:
\begin{lstcode}
\ProvidesPackage{sausagesalad}%
[2008/05/06 nonsense package]
\DefineFamily{butcher}
\DefineFamilyMember{butcher}
\FamilyProcessOptions{butcher}\relax
- \FamilyOptions{butcher}{coldcut}
+ \FamilyOptions{butcher}{coldcuts}
\end{lstcode}
- If currently none of the sausage packages are loaded, then an error
- message results because of undefined option ``\Option{coldcut}''. This is
- avoided by changing the last line of the code to:
-\begin{lstcode}[moretexcs={Family@Options}]
- \Family@Options{butcher}{coldcut}{}
+ If currently none of the sausage packages are loaded, the undefined option
+ \Option{coldcuts} leads to an error message. This is avoided by adding
+ before the last line of the code above:
+\begin{lstcode}
+ \DefineFamilyKey{butcher}%
+ {coldcuts}[true]{}%
\end{lstcode}
- Despite this, sausage packages loaded after
- \Package{sausagesalad} still do not produce cold cut. This may be corrected
+ However, sausage packages loaded after
+ \Package{sausagesalad} still do not produce cold cuts. This may be corrected
by editing the last line of the code again to:
-\begin{lstcode}[moretexcs={Family@Options}]
+\begin{lstcode}
\AtBeginDocument{%
- \Family@Options{butcher}{coldcut}{%
- \PackageWarning{sausagesalad}{%
- sausage salad needs at least
- one sausage package}%
- }%
+ \DefineFamiyKey[.sausagesalad.sty]%
+ {butcher}%
+ {coldcuts}[true]{}%
+ }
+ \DefineFamilyKey{butcher}%
+ {coldcuts}[true]{%
+ \AtBeginDocument{\FamilyOptions{butcher}%
+ {coldcuts=#1}}%
}%
\end{lstcode}
- This may throw a warning message if none of the sausage packages are loaded.
+ This code does following: First the option will be defined while
+ \Macro{begin}\PParameter{document} to do nothing for package
+ \Package{sausagesalad}. Because \Macro{@currname} and \Macro{@currext} are
+ not longer valid at this time, the optional argument on
+ \Macro{DefineFamilyKey} has to be used. But until this re-definition of the
+ option, a second definition is made, that calls the option again while
+ \Macro{begin}\PParameter{document} for the whole family and so also for
+ other sausage salad packages.
\end{Example}
%
\EndIndex{Cmd}{FamilyOptions}%
@@ -439,7 +450,7 @@ is the same as that of the previous command \Macro{FamilyOptions}.
\begin{Example}
Package \Package{sausagesalad} should have one mire option, to add
additional ingredients. Each of the ingredients sets a switch as was done
- previously for the cold cut.
+ previously for the cold cuts.
\begin{lstcode}
\newif\if@saladwith@onions
\newif\if@saladwith@gherkins
@@ -492,7 +503,7 @@ option definition.
\BeginIndex{Cmd}{FamilyBoolKey}%
\BeginIndex{Cmd}{FamilySetBool}%
In the previous examples, boolean switches often have been used. In the example
-with option \Option{coldcut}, it is necessary that the user assigns either
+with option \Option{coldcuts}, it is necessary that the user assigns either
value \PValue{true} or value \PValue{false}. There is no error message for
wrong value assignment. Because of this, boolean switches are a necessary
feature. Package \Package{scrbase} provides \Macro{FamilyBoolKey} for definition of
@@ -515,37 +526,37 @@ members, this may result in an error message about unknown value assignment
(see also \autopageref{desc:scrbase.cmd.FamilyUnkownKeyValue} and
\autopageref{desc:scrbase.cmd.FamilyKeyState}).
\begin{Example}
- The key \Option{coldcut} should be declared somehow more
+ The key \Option{coldcuts} should be declared somehow more
robust. Additionally, all sausage packages should use the same key. So
- either all or none of them will produce cold cut.
+ either all or none of them will produce cold cuts.
\begin{lstcode}
- \FamilyBoolKey{butcher}{coldcut}%
- {@coldcut}
+ \FamilyBoolKey{butcher}{coldcuts}%
+ {@coldcuts}
\end{lstcode}
- A test, whether or not to produce cold cut, may be:
+ A test, whether or not to produce cold cuts, may be:
\begin{lstcode}
- \if@coldcut
+ \if@coldcuts
...
\else
...
\fi
\end{lstcode}
This would be the same in each of the three sausage packages, thereby
- defining the attribute ``coldcut'' as a family option:
+ defining the attribute ``coldcuts'' as a family option:
\begin{lstcode}[moretexcs={define@key}]
- \@ifundefined{if@coldcut}{%
- \expandafter\newif\csname if@coldcut\endcsname
+ \@ifundefined{if@coldcuts}{%
+ \expandafter\newif\csname if@coldcuts\endcsname
}{}%
- \DefineFamilyKey[]{butcher}{coldcut}[true]{%
- \FamilySetBool{butcher}{coldcut}%
- {@coldcut}%
+ \DefineFamilyKey[]{butcher}{coldcuts}[true]{%
+ \FamilySetBool{butcher}{coldcuts}%
+ {@coldcuts}%
{#1}%
}
\end{lstcode}
or shorter:
\begin{lstcode}
- \FamilyBoolKey[]{butcher}{coldcut}%
- {@coldcut}
+ \FamilyBoolKey[]{butcher}{coldcuts}%
+ {@coldcuts}
\end{lstcode}
using the additional information at
\autopageref{explain:scrbase.macro.DefineFamilyKey}, this is not only valid
@@ -589,7 +600,7 @@ possible and allowed. Currently, the only limitation is that
\PName{definition} has to be fully expandable and will be expanded during the
assignment.
\begin{Example}
- The sausage may be cut different. For example the cold cut may stay uncut or
+ The sausage may be cut different. For example the cold cuts may stay uncut or
will be cut roughly or may be cut thinly. This information should be stored
in command \Macro{cuthow}.
\begin{lstcode}
@@ -647,6 +658,85 @@ normally result in an error message about assigning an unknown value.
\EndIndex{Cmd}{FamilySetNumerical}%
\EndIndex{Cmd}{FamilyNumericalKey}%
+\begin{Declaration}
+ \Macro{FamilyCounterKey}\OParameter{family member}\Parameter{family}%
+ \Parameter{key}\Parameter{\LaTeX{} counter}\\
+% \hphantom{\XMacro{FamilyCounterKey}}%
+% \Parameter{\LaTeX{} counter}
+ \Macro{FamilySetCounter}\Parameter{family}%
+ \Parameter{key}\Parameter{\LaTeX{} counter}\Parameter{value}
+\end{Declaration}
+\BeginIndex{Cmd}{FamilyCounterKey}%
+\BeginIndex{Cmd}{FamilySetCounter}%
+Beside\ChangedAt{v3.12}{\Package{scrbase}} \Macro{FamilyNumercialKey} that
+defines a macro to a numeric value depending on a symbolic value, there are
+circumstances when a \PName{key} directly represents a \PName{\LaTeX{}
+ counter}, that should be assigned directly to a numeric value. In those
+cases, \Macro{FamilyCounterKey} can be used that internally will call
+\Macro{FamilySetCounter}. A primary test of the \PName{value} argument is done
+that only detects whether or not usage of \PName{value} as a number is
+plausible. The assignment is done, only if this plausibility test is
+successful. Nevertheless the assignment can still fail and result in a \TeX{}
+error. But if the plausibility test fails already, this is signalled by
+\Macro{FamilyKeyStateUnknownValue}.
+
+Please note\textnote{Attention!}, this command does not support an optional
+\PName{default}.%
+\EndIndex{Cmd}{FamilySetCounter}%
+\EndIndex{Cmd}{FamilyCounterKey}%
+
+\begin{Declaration}
+ \Macro{FamilyCounterMacroKey}\OParameter{family member}\Parameter{family}%
+ \Parameter{key}\Parameter{macro}\\
+ \Macro{FamilySetCounterMacro}\Parameter{family}%
+ \Parameter{key}\Parameter{macro}\Parameter{value}%
+\end{Declaration}
+\BeginIndex{Cmd}{FamilyCounterMacroKey}%
+\BeginIndex{Cmd}{FamilySetCounterMacro}%
+These\ChangedAt{v3.12}{\Package{scrbase}} two commands differ from the
+previously described \Macro{FamilyCounterKey} and \Macro{FamilySetCounter}
+only by the fact, that they do not assign a \PName{value} to a \PName{\LaTeX
+ counter}, but define a \Macro{macro} with the
+\PName{value}. Note\textnote{Attention}, that also an optional \PName{default}
+is not supported.%
+\EndIndex{Cmd}{FamilySetCounterMacro}%
+\EndIndex{Cmd}{FamilyCounterMacroKey}%
+
+\begin{Declaration}
+ \Macro{FamilyLengthKey}\OParameter{family member}\Parameter{family}%
+ \Parameter{key}\Parameter{length}\\
+ \Macro{FamilySetLength}\Parameter{family}%
+ \Parameter{key}\Parameter{length}\Parameter{value}\\
+ \Macro{FamilyLengthMacroKey}\OParameter{family member}\Parameter{family}%
+ \Parameter{key}\Parameter{Makro}\\
+ \Macro{FamilySetLengthMacro}\Parameter{family}%
+ \Parameter{key}\Parameter{Makro}\Parameter{value}%
+\end{Declaration}
+\BeginIndex{Cmd}{FamilyLengthKey}%
+\BeginIndex{Cmd}{FamilySetLength}%
+\BeginIndex{Cmd}{FamilyLengthMacroKey}%
+\BeginIndex{Cmd}{FamilySetLengthMacro}%
+With\ChangedAt{v3.12}{\Package{scrbase}} \Macro{FamilyLengthKey} you can
+define a \PName{key} that represents a \PName{length}. It does not matter
+whether the \PName{length} is a \LaTeX{} length, a \TeX{} skip or a \TeX{}
+dimension. Internally the \PName{length} will be set to the \PName{value}
+using \Macro{FamilySetLength}. Thereby a primary test is used to decide,
+whether or not it is plausible to assign \PName{length} to \PName{value}. The
+assignment is done only if this plausibility test is successful. Nevertheless,
+not all assignment errors can be recognised, so an inaccurate \PName{value}
+can still result in \TeX{} error. Recognised errors however will be signalled
+by \Macro{FamilyKeyStateUnknownValue}.
+
+In difference to this, \Macro{FamilyLengthMacroKey} and
+\Macro{FamilySetLengthMacro} do not assign \PName{value} to a \PName{length},
+but define a \Macro{macro} with this \PName{value}.
+
+Please note\textnote{Attention!}, these commands do not support an optional
+\PName{default} argument.%
+\EndIndex{Cmd}{FamilySetLengthMacro}%
+\EndIndex{Cmd}{FamilyLengthMacroKey}%
+\EndIndex{Cmd}{FamilySetLength}%
+\EndIndex{Cmd}{FamilyLengthKey}%
\begin{Declaration}
\Macro{FamilyStringKey}\OParameter{family member}\Parameter{family}%
@@ -716,25 +806,25 @@ separated list of allowed values in the form:
Currently\ChangedAt{v3.12}{\Package{scrbase}}, \PName{values list} is
not used by \Package{scrbase}.
\begin{Example}
- Now, for the cold cut, the choices should be cut or no-cut and in case of cut
+ Now, for the cold cuts, the choices should be cut or no-cut and in case of cut
rough or thin. Rough should be the default for cutting.
\begin{lstcode}
\@ifundefined{if@thincut}{%
\expandafter
\newif\csname if@thincut\endcsname}{}%
- \@ifundefined{if@coldcut}{%
+ \@ifundefined{if@coldcuts}{%
\expandafter
- \newif\csname if@coldcut\endcsname}{}
+ \newif\csname if@coldcuts\endcsname}{}
\DefineFamilyKey{butcher}%
- {coldcut}[true]{%
- \FamilySetBool{butcher}{coldcut}%
- {@coldcut}%
+ {coldcuts}[true]{%
+ \FamilySetBool{butcher}{coldcuts}%
+ {@coldcuts}%
{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\@thincutfalse
\else
\ifstr{#1}{thin}{%
- \@coldcuttrue
+ \@coldcutstrue
\@thincuttrue
\FamilyKeyStateProcessed
}{}%
@@ -742,14 +832,14 @@ not used by \Package{scrbase}.
}%
\end{lstcode}
Let's have a look at the definition of \Option{butcher}:
- First of all, we try to set the boolean switch of cold cut using
+ First of all, we try to set the boolean switch of cold cuts using
\Macro{FamilySetBool}. After this command, we test whether or not
\Macro{FamilyKeyState} signals the success of the command with state
\Macro{FamilyKeyStateProcessed}. If so, only the thin cut has to be
deactivated.
In the other case, the value will be tested to be equal to \PValue{thin}. In
- that case, cold cut and thin cut are activated and the state will be
+ that case, cold cuts and thin cut are activated and the state will be
switched to \Macro{FamilyKeyStateProcessed}. If the last test failed also,
the failure state of \Macro{FamilySetBool} is still valid at the end of the
execution.
@@ -1083,7 +1173,7 @@ there is no corresponding internal command.%
\end{Declaration}
\BeginIndex{Cmd}{ifnumber}%
Note that this does not compare numbers. The \PName{then instructions} will
-be executed if the expansion of \PName{string} consists of digits
+be executed if the one step expansion of \PName{string} consists of digits
only. Otherwise the \PName{else instructions} will be used. There is no
corresponding internal command.
%
@@ -1096,9 +1186,9 @@ corresponding internal command.
\end{Declaration}
\BeginIndex{Cmd}{ifdimen}%
Note that this does not compare dimensions. The \PName{then instructions} will
-be executed, if the expansion of \PName{string} consists of digits and a valid
-unit of length. Otherwise, the \PName{else instructions} will be used. There
-is no corresponding internal command.
+be executed, if the one step expansion of \PName{string} consists of digits
+and a valid unit of length. Otherwise, the \PName{else instructions} will be
+used. There is no corresponding internal command.
%
\EndIndex{Cmd}{ifdimen}%
@@ -1192,6 +1282,11 @@ defined language, then an error message is given. Otherwise, the
\PName{term} for the language will be redefined according to
\PName{definition}.
+The\ChangedAt{v3.12}{\Package{scrbase}} command \Macro{defcaptionname} always
+defines the \PName{term}. So previous definitions of \PName{term} for the
+given \PName{language} will be overwritten. You may use this command even for
+undefined languages.
+
\KOMAScript{} employs \Macro{providecaptionname} in order to define the
commands in \autoref{sec:scrlttr2-experts.languages}.
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 9fc393d423e..724167ccbb0 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,7 +48,7 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-experts.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for
experts)]
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 2d9a75f5718..1bd8a0eac3e 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
@@ -1,6 +1,6 @@
% ======================================================================
% scrbookreportarticle.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrbookreportarticle.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,12 +46,13 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-06-27 07:40:22 +0200 (Fri, 27 Jun 2014) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)]
-\translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi}
+\translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and
+ Krickette Murabayashi\and Jana Schubert\and Jens H\"uhne}
-% Date of translated german file: 2013-05-31
+% Date of translated german file: 2014-06-26
\chapter{The Main Classes: \Class{scrbook}, \Class{scrreprt}, and
\Class{scrartcl}}
@@ -505,11 +506,13 @@ or decrementing the counter, one can choose the lowest sectional unit level to
be included in the table of contents. The same happens with the standard
classes.
-The user of the \Package{scrpage2}\IndexPackage{scrpage2} package (see
-\autoref{cha:scrpage}) does not need to remember the numerical
-values of each sectional unit. They are given by the values of the
-macros \Macro{chapterlevel}, \Macro{sectionlevel}, and so on, down to
-\Macro{subparagraphlevel}.
+Please note\textnote{Attention!} that for \Macro{part} the values of
+\Counter{tocdepth} and \Counter{secnumdepth}\IndexCounter{secnumdepth} (see
+\autoref{sec:maincls.structure},
+\autopageref{desc:maincls.counter.secnumdepth}) are not the same in
+\Class{scrartcl}\OnlyAt{\Class{scrartcl}}. Therefore, you should not use
+\Macro{partnumdepth}\IndexCmd{partnumdepth} to set the value of
+\Counter{tocdepth}.%
\begin{Example}
Assume that you are preparing an article that uses the sectional
unit \Macro{subsubsection}. However, you do not want this sectional
@@ -579,8 +582,8 @@ for the purpose of page layout calculations. {\KOMAScript} takes this into
account by automatically passing the option \Option{headinclude} to the
\Package{typearea} package whenever the \Option{headsepline} option is
used. \KOMAScript{} behaves similar to \Option{footinclude} using
-\Option{footsepline}. Package \Package{scrpage2} (see \autoref{cha:scrpage})
-adds additional features to this.%
+\Option{footsepline}. Package \Package{scrlayer-scrpage} (see
+\autoref{cha:scrlayer-scrpage}) adds additional features to this.%
%
\EndIndex{Option}{headsepline~=\PName{simple switch}}%
\EndIndex{Option}{footsepline~=\PName{simple switch}}%
@@ -652,10 +655,9 @@ implicitly on the first page of a chapter.
Please\textnote{Attention!} note that the change between automatic and manual
running headings is no longer performed by page style changes when using the
-\Package{scrpage2} package, but instead via special instructions. The page
-styles \PValue{headings} and \PValue{myheadings} should not be used together
-with this package (see \autoref{cha:scrpage},
-\autopageref{desc:scrpage.pagestyle.useheadings}).%
+\Package{scrlayer-scrpage} package, but instead via special instructions. The
+page styles \PValue{headings} and \PValue{myheadings} should not be used
+together with this package.%
%
\EndIndex{Pagestyle}{empty}% Darueber erfahren wir nun nichts mehr
@@ -667,18 +669,19 @@ In order to change the font style used in the header, footer, or for the page
number\ChangedAt{v2.8p}{%
\Class{scrbook}\and \Class{scrreprt}\and \Class{scrartcl}}%
, please use the interface described in \autoref{sec:maincls.textmarkup},
-\autopageref{desc:maincls.cmd.setkomafont}. The same element is used for header
-and footer, which you can designate with
+\autopageref{desc:maincls.cmd.setkomafont}. The same element is used for
+header and footer, which you can designate with
\FontElement{pageheadfoot}\IndexFontElement{pageheadfoot}%
-\important{\FontElement{pageheadfoot}}. The element for
-the page number within the header or footer is called
+\important{\FontElement{pageheadfoot}}. The element for the page number within
+the header or footer is called
\FontElement{pagenumber}\IndexFontElement{pagenumber}%
-\important{\FontElement{pagenumber}}.
-The element \FontElement{pagefoot}\IndexFontElement{pagefoot}, that is
-additionally supported by the \KOMAScript{} classes, will be used only if
-a page style has been defined that has text at the foot line, using package
-\Package{scrpage2}\IndexPackage{scrpage2} (see \autoref{cha:scrpage},
-\autopageref{desc:scrpage.fontelement.pagefoot}).
+\important{\FontElement{pagenumber}}. The element
+\FontElement{pagefoot}\IndexFontElement{pagefoot}, that is additionally
+supported by the \KOMAScript{} classes, will be used only if a page style has
+been defined that has text at the foot line, using package
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage} (see
+\autoref{cha:scrlayer-scrpage},
+\autopageref{desc:scrlayer-scrpage.fontelement.pagefoot}).
The default settings can be found in
\autoref{tab:maincls.defaultFontsHeadFoot}.%
@@ -733,20 +736,21 @@ The default settings can be found in
\end{Example}
It is not possible to use these methods to force capitals to be used
automatically for the running headings. For that, please use the
-\Package{scrpage2} package (see \autoref{cha:scrpage},
-\autopageref{desc:scrpage.option.markuppercase}).
+\Package{scrlayer-scrpage} package (see \autoref{cha:scrlayer-scrpage},
+\autopageref{desc:scrlayer-scrpage.option.markcase}).
If you define your own page styles, the commands
\Macro{usekomafont}\PParameter{pageheadfoot}, \Macro{usekomafont}\PParameter
{pagenumber}, and \Macro{usekomafont}\PParameter{pagefoot} can be useful. If
-you do not use the {\KOMAScript} package \Package{scrpage2} (see
-\autoref{cha:scrpage}) for that, but, for example, the package
+you do not use the {\KOMAScript} package \Package{scrlayer-scrpage} (see
+\autoref{cha:scrlayer-scrpage}) for that, but, for example, the package
\Package{fancyhdr}\IndexPackage{fancyhdr} (see \cite{package:fancyhdr}), you
can use these commands in your definitions. Thereby you can remain compatible
with {\KOMAScript} as much as possible. If you do not use these commands in
your own definitions, changes like those shown in the previous examples have
-no effect. The package \Package{scrpage2}\IndexPackage {scrpage2} takes care
-to keep the maximum possible compatibility with other packages itself.
+no effect. The package
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage} takes care to keep
+the maximum possible compatibility with other packages itself.
%
\EndIndex{FontElement}{pagenumber}%
\EndIndex{FontElement}{pagefoot}%
@@ -765,12 +769,12 @@ to keep the maximum possible compatibility with other packages itself.
\BeginIndex{Cmd}{markright}%
With page style \Pagestyle{myheadings}\important{\Pagestyle{myheadings}}%
\IndexPagestyle{myheadings}, there's no automatic setting of the running head.
-Instead of this one would set it with the help of commands \Macro{markboth} and
-\Macro{markright}. Thereby \PName{left mark} normally will be used at the head
-of even pages and \PName{right mark} at the heads of odd pages. With one-sided
-printing, only the \PName{right mark} exists. Using package
-\Package{scrpage2}\IndexPackage{scrpage2}\important{\Package{scrpage2}}, the
-additional command
+Instead of this one would set it with the help of commands \Macro{markboth}
+and \Macro{markright}. Thereby \PName{left mark} normally will be used at the
+head of even pages and \PName{right mark} at the heads of odd pages. With
+one-sided printing, only the \PName{right mark} exists. Using package
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage}\important{\Package{scrlayer-scrpage}},
+the additional command
\Macro{markleft}\IndexCmd{markleft}\important{\Macro{markleft}} exists.
The commands may be used with other page styles too. Combination with automatic
@@ -829,8 +833,8 @@ The page styles can be redefined with the \Macro{renewcommand} macro.
example. Naturally you can also use a user-defined page style.
Assume you have defined your own page style for initial chapter pages
- with the package \Package{scrpage2} (see
- \autoref{cha:scrpage}). You have given to this page style the
+ with the package \Package{scrlayer-scrpage} (see
+ \autoref{cha:scrlayer-scrpage}). You have given to this page style the
fitting name \PValue{chapter}. To actually use this style, you must
redefine the macro \Macro{chapterpagestyle} accordingly:
\begin{lstcode}
@@ -935,8 +939,6 @@ the next page which {\TeX} outputs will have the number 1 in the style
\LoadCommon{8}% \section{Interleaf Pages}
\LoadCommon{9}% \section{Footnotes}
-\LoadCommon{10}% -"-
-\LoadCommon{11}% -"-
\section[Demarcation]{Demarcation\protect\OnlyAt{\Class{scrbook}}}
\label{sec:maincls.separation}
@@ -1432,7 +1434,7 @@ does not use
the optional argument \PName{short version} at the table of
contents, but for the running head only. Nevertheless, such a running head
needs an appropriate page style. See \autoref{sec:maincls.pagestyle} and
-\autoref{cha:scrpage} about this. With option
+\autoref{cha:scrlayer-scrpage} about this. With option
\OptionValue{headings}{optiontotoc}%
\IndexOption[indexmain]{headings~=\PValue{optiontotoc}}, \KOMAScript{} does not
use the
@@ -2156,19 +2158,19 @@ Since chapters only exist in the classes \Class{scrbook} and
\Macro{addchap} and \Macro{addsec} to make headings without numbers, there
also exist corresponding commands for making the running heads of those.
Please note\textnote{Attention!}, that the predefined \Macro{addchapmark}
- and \Macro{addsecmark} use \Macro{chaptermark} and
- \Macro{sectionmark} while they set counter
- \Counter{secnumdepth} to -1 locally. You should pay attention for this
- exspecially if you redefine \Macro{chaptermark} or
- \Macro{sectionmark}, e.\,g., you should also redefine \Macro{addchapmark}
- and \Macro{addsecmark} suitable.
-
- \OnlyAt{\Class{scrbook}\and\Class{scrreprt}}Of course there is no
- command \Macro{chaptermark} or \Macro{chaptermarkformat} in
+ and \Macro{addsecmark} use \Macro{chaptermark} and \Macro{sectionmark} while
+ they set counter \Counter{secnumdepth} to -1 locally. You should pay
+ attention for this exspecially if you redefine \Macro{chaptermark} or
+ \Macro{sectionmark} (see \Macro{ifnumbered} on
+ \autopageref{desc:maincls.cmd.ifnumbered}) or you should also redefine
+ \Macro{addchapmark} and \Macro{addsecmark} suitable.
+
+ \OnlyAt{\Class{scrbook}\and\Class{scrreprt}}Of course there is no command
+ \Macro{chaptermark} or \Macro{chaptermarkformat} in
\Class{scrartcl}. \OnlyAt{\Class{scrartcl}}Accordingly,
- \Macro{subsectionmark} and \Macro{subsectionmarkformat} exist only
- in \Class{scrartcl}. This changes when you use the
- \Package{scrpage2} package (see \autoref{cha:scrpage}).\par
+ \Macro{subsectionmark} and \Macro{subsectionmarkformat} exist only in
+ \Class{scrartcl}. This changes when you use the \Package{scrlayer-scrpage}
+ package (see \autoref{cha:scrlayer-scrpage}).\par
\end{Explain}
Similar to \Macro{chapterformat} and \Macro{othersectionlevelsformat},
the commands \Macro{chaptermarkformat} (not in \Class{scrartcl}),
@@ -2207,26 +2209,104 @@ As you can see, both the commands \Macro{chapappifchapterprefix} and
\begin{Declaration}
- \Counter{secnumdepth}
+ \Counter{secnumdepth}\\
+ \Macro{partnumdepth}\\
+ \Macro{chapternumdepth}\\
+ \Macro{sectionnumdepth}\\
+ \Macro{subsectionnumdepth}\\
+ \Macro{subsubsectionnumdepth}\\
+ \Macro{paragraphnumdepth}\\
+ \Macro{subparagraphnumdepth}
\end{Declaration}%
\BeginIndex{Counter}{secnumdepth}\BeginIndex{}{numbering}%
-Per default, in the classes \Class{scrbook}\IndexClass{scrbook} and
-\Class{scrreprt}\IndexClass{scrreprt}, the section levels from
-\Macro{part}\IndexCmd{part}\IndexCmd{chapter}\IndexCmd{section} down
-to \Macro{subsection}\IndexCmd{subsection}, and in the class
-\Class{scrartcl}\IndexClass{scrartcl}, the levels from \Macro{part}
-down to \Macro{subsubsection}\IndexCmd{subsubsection} are numbered.
-This is controlled by the {\LaTeX} counter \Counter{secnumdepth}. The
-value \(-\)1 represents \Macro{part}, 0 the level \Macro{chapter},
-and so on. By defining, incrementing, or decrementing this counter, you
-can determine down to which level the headings are numbered. The same
-applies in the standard classes. Please refer also to the explanation
-concerning the counter \Counter{tocdepth} in
+\BeginIndex{Cmd}{partnumdepth}%
+\BeginIndex{Cmd}{chapternumdepth}%
+\BeginIndex{Cmd}{sectionnumdepth}%
+\BeginIndex{Cmd}{subsectionnumdepth}%
+\BeginIndex{Cmd}{subsubsectionnumdepth}%
+\BeginIndex{Cmd}{paragraphnumdepth}%
+\BeginIndex{Cmd}{subparagraphnumdepth}%
+Section levels in the classes \Class{scrbook}\IndexClass{scrbook} and
+\Class{scrreport}\IndexClass{scrreprt} are, by default, numbered from
+\Macro{part}\IndexCmd{part}\IndexCmd{chapter}\IndexCmd{section} down to
+\Macro{subsection}\IndexCmd{subsection}. In class
+\Class{scrartcl}\IndexClass{scrartcl} the default numbering is from
+\Macro{part} down to \Macro{subsubsection}\IndexCmd{subsubsection}. The
+actual depth to which headings will be numbered is controlled by the \LaTeX{}
+counter \Counter{secnumdepth}. Since version~3.12 \KOMAScript{} provides the
+commands \Macro{partnumdepth} to \Macro{subparagraphnumdepth} which return the
+number that corresponds to the level they bear in their name. This saves users
+the trouble of having to remember abstract numbers and allows them to define
+the depth to which headings should be numbered with relative ease.
+
+\KOMAScript{} provides the commands \Macro{partnumdepth} to
+\Macro{subparagraphnumdepth} so\ChangedAt{v3.12}{\Class{scrbook}\and
+ \Class{scrreprt}\and \Class{scrartcl}} users do not have to remember
+abstract numbers, to be able to define the section level down to which
+headings should be numbered. These commands stand for the corresponding
+numbers of the section levels.%
+\begin{Example}
+ For a book project you want the section levels from part down to the section
+ to be numbered. To achieve this, you have to set counter
+ \Counter{secnumdepth} to the value represented by \Macro{sectionnumdepth} in
+ the preamble of your document:
+\begin{lstcode}
+ \setcounter{secnumdepth}{\sectionnumdepth}
+\end{lstcode}
+\end{Example}
+Redefining these commands is not allowed. Doing so could lead to unexpected
+results not only with \KOMAScript{} but also with third party packages. Thus,
+it is recommended to never redefine any of them.
+
+Do not confuse the counters \Counter{secnumdepth} and \Counter{tocdepth},
+please refer to the explanation concerning the counter \Counter{tocdepth} in
\autoref{sec:maincls.toc},
-\autopageref{desc:maincls.counter.tocdepth}.
-%
-\EndIndex{Counter}{secnumdepth}\EndIndex{}{numbering}
+\autopageref{desc:maincls.counter.tocdepth}. Actually, depending on the class
+you are using, the meaning of the values of the counters \Counter{secnumdepth}
+and \Counter{tocdepth} may deviate from one another for the same section
+level.%
+\EndIndex{Cmd}{subparagraphnumdepth}%
+\EndIndex{Cmd}{paragraphnumdepth}%
+\EndIndex{Cmd}{subsubsectionnumdepth}%
+\EndIndex{Cmd}{subsectionnumdepth}%
+\EndIndex{Cmd}{sectionnumdepth}%
+\EndIndex{Cmd}{chapternumdepth}%
+\EndIndex{Cmd}{partnumdepth}%
+\EndIndex{Counter}{secnumdepth}\EndIndex{}{numbering}%
+\begin{Declaration}
+ \Macro{ifnumbered}\Parameter{section level}%
+ \Parameter{then code}\Parameter{else code}\\
+ \Macro{ifunnumbered}\Parameter{section level}%
+ \Parameter{then code}\Parameter{else code}
+\end{Declaration}
+\BeginIndex{Cmd}{ifnumbered}%
+\BeginIndex{Cmd}{ifunnumbered}%
+After\ChangedAt{v3.12}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}} describing above how to define down to which section level
+headings are numbered, the commands \Macro{ifnumbered} and
+\Macro{ifunnumbered} can be used to execute code depending on whether a
+\PName{section level} is numbered or not. If the current setting of
+\Counter{secnumdepth} stipulates that a \PName{section level} will be
+numbered, the \PName{then code} after \Macro{ifnumbered} gets executed. If it
+is not numbered, the \PName{else code} gets executed. The \Macro{ifunnumbered}
+command behaves in exactly the opposite manner, executing the \PName{then
+ code} if the current level is not numbered and the \PName{else code} if it
+is. The \PName{section level} parameter is simply the \LaTeX{} name of a
+section like \PValue{part}, \PValue{chapter}, \PValue{section},
+\PValue{subsection}, \PValue{subsubsection}, \PValue{paragraph} oder
+\PValue{subparagraph}.\PValue{part}, \PValue{chapter}, \PValue{section},
+\PValue{subsection}, \PValue{subsubsection}, \PValue{paragraph}, or
+\PValue{subparagraph}.
+
+\KOMAScript{} itself uses these tests, for example, in the definition of
+\Macro{chaptermark}\IndexCmd{chaptermark} within page style
+\Pagestyle{headings}\IndexPagestyle{headings}. This indirectly guarantees that
+headings inserted by \Macro{addchap} do not set a number inside the running
+head (see also \Macro{addchapmark},
+\autopageref{desc:maincls.cmd.addchapmark}).%
+\EndIndex{Cmd}{ifnumbered}%
+\EndIndex{Cmd}{ifunnumbered}%
\begin{Declaration}
\Macro{setpartpreamble}%
@@ -3549,7 +3629,7 @@ An overview about all settings to option \Option{listof} may be found at
\entry{\PValue{flat}, \PValue{left}}{%
The lists of floating environments will be printed like a kind of
table. The caption numbers will be the first column, the caption texts the
- second column, and the page numbers the last column. The with of the first
+ second column, and the page numbers the last column. The width of the first
column depends on the previous \LaTeX{} run.%
\IndexOption{listof~=\PValue{flat}}}%
\entry{\PValue{graduated}, \PValue{indent}, \PValue{indented}}{%
@@ -3957,7 +4037,9 @@ environments.%
%%% Local Variables:
%%% mode: latex
+%%% mode: flyspell
%%% coding: us-ascii
+%%% ispell-local-dictionary: "english"
%%% TeX-master: "../guide"
%%% End:
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex
index 82ec269a6aa..2fde1fe84a4 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrdatetime.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrdatetime.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrdatetime.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,33 +46,34 @@
% ============================================================================
\KOMAProvidesFile{scrdatetime.tex}
- [$Date: 2013-12-13 12:13:03 +0100 (Fr, 13 Dez 2013) $
+ [$Date: 2014-01-23 16:22:54 +0100 (Thu, 23 Jan 2014) $
KOMA-Script guide (chapter: scrdate, scrtime)]
\translator{Markus Kohm\and Gernot Hassenpflug}
-% Date of translated German file: 2012/02/23
-
-\chapter{Weekday and Time Using \Package{scrdate} and
- \Package{scrtime}}
-\labelbase{datetime}
-
-There are two packages included in {\KOMAScript} to improve and extend
-the handling of date\Index{date} and time\Index{time} over and above
-what is provided by the standard commands \Macro{today} and
-\Macro{date}. Like all the other packages from the {\KOMAScript}
-bundle these two packages may be used not only with {\KOMAScript}
-classes but also with the standard and many other classes.
-
-Since
-\KOMAScript~3.05a\ChangedAt{v3.05a}{\Package{scrdate}\and\Package{scrtime}}
-this packages use the common version number of \KOMAScript. This change has
-been done, because the packages need the corresponding version of
-\Package{scrkbase} and \Package{scrbase}.
-
-
-\section{The Day of the Week Using
- \Package{scrdate}}
-\label{sec:datetime.scrdate}
+% Date of translated German file: 2014/01/23
+
+% \chapter{Weekday and Time Using \Package{scrdate} and
+% \Package{scrtime}}
+% \labelbase{datetime}
+
+% There are two packages included in {\KOMAScript} to improve and extend
+% the handling of date\Index{date} and time\Index{time} over and above
+% what is provided by the standard commands \Macro{today} and
+% \Macro{date}. Like all the other packages from the {\KOMAScript}
+% bundle these two packages may be used not only with {\KOMAScript}
+% classes but also with the standard and many other classes.
+
+% Since
+% \KOMAScript~3.05a\ChangedAt{v3.05a}{\Package{scrdate}\and\Package{scrtime}}
+% this packages use the common version number of \KOMAScript. This change has
+% been done, because the packages need the corresponding version of
+% \Package{scrkbase} and \Package{scrbase}.
+
+% \section{The Day of the Week Using
+% \Package{scrdate}}
+% \label{sec:datetime.scrdate}
+\chapter{The Day of the Week Using \Package{scrdate}}
+\labelbase{scrdate}
\BeginIndex{Package}{scrdate}
With version~3.05a the functionality of this package enhanced a lot. Beside of
@@ -88,10 +89,12 @@ day of the week of every date of the Gregorian calendar now.
The\ChangedAt{v3.05a}{\Package{scrdate}} command \Macro{CenturyPart} offers
the value of the century digits\,---\,hundreds and thousands\,---\,of a
\PName{year}. The command \Macro{DecadePart} in difference offers the other
-digits which are the units and tens. The number of digits of \PName{year}
-does not care. The value may be assigned to a counter or may be used for
-calculations, i.\,e., using \Macro{numexpr}\IndexCmd{numexpr}. For output of
-an Arabic number of the value prefix it with \Macro{the}\IndexCmd{the}.
+digits which are the units and tens. The number of digits of \PName{year} does
+not care. The value may be assigned to a counter or may be used for
+calculations, i.\,e., using \Macro{numexpr}\IndexCmd{numexpr}. For
+output\textnote{Attention!} of an Arabic number of the value prefix it with
+\Macro{the}
+\IndexCmd{the}.
\begin{Example}
You want to calculate and output the century of the current year.
@@ -129,8 +132,8 @@ expected format of the \PName{ISO-date} is:
\PName{year}\texttt{-}\PName{month}\texttt{-}\PName{day}. It does not matter
whether \PName{month} or \PName{day} have one or two digits. The result of
both commands may be assigned to a counter or used for calculations, i.\,e.,
-using \Macro{numexpr}\IndexCmd{numexpr}. For output of
-an Arabic number of the value prefix it with \Macro{the}\IndexCmd{the}.
+using \Macro{numexpr}\IndexCmd{numexpr}. For output\textnote{Attention!} of an
+Arabic number of the value prefix it with \Macro{the}\IndexCmd{the}.
\begin{Example}
You want to know the number of the day of the week of the 1st~May~2027.
@@ -319,13 +322,40 @@ There's no such command for changing the result of
\EndIndex{Cmd}{nameday}
-\minisec{Name of the day of the week in different languages}%
-Currently the package \Package{scrdate} knows the languages English (english,
-american, USenglish, UKenglish and british), German (german, ngerman,
-austrian\ChangedAt{v3.08b}{\Package{scrdate}}, and naustrian), French
-(french), Italian (italian), Spanish (spanish), Croatian (croatian), Finnish
-(finnish), Norwegian (norsk), Swedish (swedish), and Danish (danish). If you
-want to configure it for other languages, see \File{scrdate.dtx}.
+\begin{Declaration}
+ \Macro{newdaylanguage}\Parameter{language}\\
+ \hphantom{\XMacro{newdaylanguage}}%
+ \Parameter{Monday}\Parameter{Tuesday}\Parameter{Wednesday}%
+ \Parameter{Thursday}\\
+ \hphantom{\XMacro{newdaylanguage}}%
+ \Parameter{Friday}\Parameter{Saturday}\Parameter{Sunday}%
+\end{Declaration}
+\BeginIndex{Cmd}{newdaylanguage}
+Currently the package \Package{scrdate} knows the following languages:
+\begin{itemize}
+\item Croatian (\PValue{croatian}),
+\item Czech (\PValue{czech}\ChangedAt{v3.13}{\Package{scrdate}}),
+\item Danish (\PValue{danish}),
+\item Dutch (\PValue{dutch}),
+\item English (\PValue{american}\ChangedAt{v3.13}{\Package{scrdate}},
+ \PValue{australian}, \PValue{british}, \PValue{canadian}, \PValue{english},
+ \PValue{UKenglish}, and USenglish),
+\item Finnish (\PValue{finnish}),
+\item French (\PValue{acadian}, \PValue{canadien},
+ \PValue{francais}\ChangedAt{v3.13}{\Package{scrdate}}, and \PValue{french}),
+\item German (\PValue{austrian}\ChangedAt{v3.08b}{\Package{scrdate}},
+ \PValue{german}, \PValue{naustrian}, \PValue{ngerman},
+ \PValue{nswissgerman}, and
+ \PValue{swissgerman}\ChangedAt{v3.13}{\Package{scrdate}}),
+\item Italian (\PValue{italian}),
+\item Norwegian (\PValue{norsk}),
+\item Polish (\PValue{polish}\ChangedAt{v3.13}{\Package{scrdate}}),
+\item Spanish (\PValue{spanish}),
+\item Swedish (\PValue{swedish}).
+\end{itemize}
+If you want to configure it for other languages, you may use this command. The
+first argument is the name of the language and the other arguments are the
+names of the corresponding days.
In the current implementation it does not matter whether you load
\Package{scrdate} before or after
@@ -342,15 +372,25 @@ correct language will be used.
by \Package{scrdate}. If you are using another language selection you will
get (US-)English names.
\end{Explain}
+
+By the way: If you found a suitable definition for a language, that has not
+been defined before, please mail it to the \KOMAScript{} author. There is a
+good chance, that he will add support for the language to \Package{scrdate}.%
+\EndIndex{Cmd}{newdaylanguage}%
+%
\EndIndex{Package}{scrdate}
-\section{Getting the Time with Package}
-\label{sec:datetime.scrtime}
+% \section{Getting the Time with Package}
+% \label{sec:datetime.scrtime}
+\chapter{Getting the Time with Package \Package{scrtime}}
+\labelbase{scrtime}
\BeginIndex{Package}{scrtime}
-The second problem is the question of the current time. The solution
-may be found using package \Package{scrtime}.
+This package provides an answer to the question of the current time. Since
+version~3.05 this package uses the option interface already known from
+the \KOMAScript{} classes and several other \KOMAScript{} packages. See for
+example \autoref{sec:typearea.options} for more information.
\begin{Declaration}%
\Macro{thistime}\OParameter{delimiter}\\
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 5baf6701c96..6446ee2e5cf 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: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-01-14 17:52:03 +0100 (Tue, 14 Jan 2014) $
KOMA-Script package scrextend]
\translator{Markus Kohm}
@@ -191,8 +191,6 @@ style is predefined by the \LaTeX{} kernel. So it should be available always.%
\LoadCommon{8}% \section{Interleaf Pages}
\LoadCommon{9}% \section{Footnotes}
-\LoadCommon{10}% -"-
-\LoadCommon{11}% -"-
\LoadCommon{15}% \section{Dicta}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex
index 901ae104649..db89c27a32c 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex
@@ -46,7 +46,7 @@
% ============================================================================
\KOMAProvidesFile{scrhack.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (chapter: scrhack)]
\translator{Markus Kohm}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn-example.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn-example.tex
new file mode 100644
index 00000000000..86a7be8f4a3
--- /dev/null
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn-example.tex
@@ -0,0 +1,131 @@
+% ======================================================================
+% scrlayer-notecolumn-example.tex
+% Copyright (c) Markus Kohm, 2013-2014
+%
+% This file is part of the LaTeX2e KOMA-Script bundle.
+%
+% This work may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c of the license.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later and of this work.
+%
+% This work has the LPPL maintenance status "author-maintained".
+%
+% The Current Maintainer and author of this work is Markus Kohm.
+%
+% This work consists of all files listed in manifest.txt.
+% ----------------------------------------------------------------------
+% scrlayer-notecolumn-example.tex
+% Copyright (c) Markus Kohm, 2013-2014
+%
+% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
+% Version 1.3c, verteilt und/oder veraendert werden.
+% Die neuste Version dieser Lizenz ist
+% http://www.latex-project.org/lppl.txt
+% und Version 1.3c ist Teil aller Verteilungen von LaTeX
+% Version 2005/12/01 oder spaeter und dieses Werks.
+%
+% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
+% (allein durch den Autor verwaltet).
+%
+% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm.
+%
+% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
+% ======================================================================
+%
+% Example file for the chapter about scrlayer-notecolumn
+% of the KOMA-Script guide
+% Maintained by Markus Kohm
+%
+% ----------------------------------------------------------------------
+%
+% Beispieldatei für das Kapitel über scrlayer-notecolumn
+% in der KOMA-Script-Anleitung
+% Verwaltet von Markus Kohm
+%
+% ============================================================================
+\documentclass{scrartcl}
+\usepackage[ngerman]{babel}
+\usepackage{selinput}
+\SelectInputMappings{
+ adieresis={ä},
+ germandbls={ß},
+}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{xcolor}
+
+\usepackage{scrjura}
+\setkomafont{contract.Paragraph}{\bfseries}
+\setkeys{contract}{preskip=-\dp\strutbox}
+
+\usepackage{scrlayer-scrpage}
+\usepackage{scrlayer-notecolumn}
+
+\newlength{\paragraphscolwidth}
+\AfterCalculatingTypearea{%
+ \setlength{\paragraphscolwidth}{.333\textwidth}%
+ \addtolength{\paragraphscolwidth}{-\marginparsep}%
+}
+\recalctypearea
+\DeclareNewNoteColumn[%
+ position=\oddsidemargin+1in
+ +.667\textwidth
+ +\marginparsep,
+ width=\paragraphscolwidth,
+ font=\raggedright\footnotesize
+ \color{blue}
+]{paragraphs}
+
+\begin{document}
+
+\title{Kommentar zum GüdaVaS}
+\author{Professor R. O. Tenase}
+\date{11.\,11.\,2011}
+\maketitle
+\tableofcontents
+
+\section{Vormerkung}
+Das GüdaVaS ist ohne jeden Zweifel das wichtigste Gesetz, das in
+Spaßmaniern in den letzten eintausend Jahren verabschiedet wurde.
+Die erste Lesung fand bereits am 11.\,11\,1111 im obersten
+spaßmanischen Kongress statt, wurde aber vom damalige Spaßvesier
+abgelehnt. Erst nach Umwandlung der spaßmanischen, aberwitzigen Monarchie
+in eine repräsentative, witzige Monarchie durch W. Itzbold, den
+urkomischen, am 9.\,9.\,1999 war der Weg für dieses Gesetz endlich frei.
+
+\section{Analyse}
+
+\begin{addmargin}[0pt]{.333\textwidth}
+ \makenote[paragraphs]{%
+ \protect\begin{contract}
+ \protect\Paragraph{title={Kein Witz ohne Publikum}}
+ Ein Witz kann nur dort witzig sein, wo er auf ein Publikum trifft.
+ \protect\end{contract}
+ }
+ Dies ist eine der zentralsten Aussagen des Gesetzes. Sie ist derart
+ elementar, dass es durchaus angebracht ist, sich vor der Weisheit der
+ Verfasser zu verbeugen.
+
+ \syncwithnotecolumn[paragraphs]\bigskip
+ \makenote[paragraphs]{%
+ \protect\begin{contract}
+ \protect\Paragraph{title={Komik der Kultur}}
+ \setcounter{par}{0}Die Komik eines Witzes kann durch das kulturelle
+ Umfeld, in dem er erzählt wird, bestimmt sein.
+
+ Die Komik eines Witzes kann durch das kulturelle Umfeld, in dem er
+ spielt, bestimmt sein.
+ \protect\end{contract}
+ }
+ Die kulturelle Komponente eines Witzes ist tatsächlich nicht zu
+ vernachlässigen. Über die politische Korrektheit der Nutzung des kulturellen
+ Umfeldes kann zwar trefflich gestritten werden, nichtsdestotrotz ist die
+ Treffsicherheit einer solchen Komik im entsprechenden Umfeld frappierend. Auf
+ der anderen Seite kann ein vermeintlicher Witz im falschen kulturellen
+ Umfeld auch zu einer echten Gefahr für den Witzeerzähler werden.
+\end{addmargin}
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn.tex
index 63606d0b3a6..877a555abea 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-notecolumn.tex
@@ -1,90 +1,161 @@
-\immediate\write17{^^J%
-+----------------------------------------------------------------------^^J%
-| WARNING (`scrlayer-notecolumn.tex'):^^J%
-+----------------------------------------------------------------------^^J%
-| YOU SHOULD NOTE, THAT THIS IS NOT AN OFFICIAL RELEASE!^^J%
-| THIS VERSION IS INTENDED TO BE USED FOR TESTING ONLY!^^J%
-| USAGE FOR PURPOSES OTHER THAN INTENDED IS DANGEROUS!^^J%
-| DON'T EXPECT ANY SUPPORT FOR THIS VERSION!^^J%
-+----------------------------------------------------------------------^^J%
-}
-%%
-%% This is file `scrlayer-notecolumn.tex',
-%% generated with the docstrip utility, extended by scrdocstrip.
-%%
-%% The original source files were:
-%%
-%% scrlayer-notecolumn.dtx (with options: `doc')
-%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
-%%
-%% This file was generated from file(s) of the KOMA-Script bundle.
-%% ---------------------------------------------------------------
-%%
-%% It may be distributed under the conditions of the
-%% LaTeX Project Public License in the version distributed together
-%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
-%%
-%% This file may only be distributed together with a copy of the
-%% KOMA-Script bundle. You may however distribute the
-%% KOMA-Script bundle without all such generated files. See also
-%% `lppl.txt' or `lppl-de.txt' for additional information.
-%%
-%% The list of files belonging to KOMA-Script distribution is given in
-%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
-%% additional information.
-%%
-%% If this file is a beta version, you may not be allowed to distribute
-%% it. Look at the comments below to see if this is the case.
-%%
-%% English and German manuals are part of KOMA-Script bundle.
-%% ----------------------------------------------------------
-%%
-%% See `README'.
-%%
-%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
-%% find a complete unmodified copy of LaTeX2e at
-%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
-%%
-\ProvidesFile{scrlayer-notecolumn.tex}[%
- 15/11/2013 v0.1.1514
- (end user interface for scrlayer)]
-
-\chapter[{End User Interface \Package{scrlayer-notecolumn}}]{End User
- Interface \Package{scrlayer-notecolumn}\footnote{This is not a translation
- of the corresponding chapter of the German \KOMAScript{} manual but the
- tentative and primary implementation manual of package
- \Package{scrlayer-notecolumn}. As long as \Package{scrlayer-notecolumn} is
- primary a proof of concept this doesn't matter. But nevertheless, a
- German to English translator would still be welcome.}}
-\label{sec:scrlayer.notecolumn}
+% ======================================================================
+% scrlayer-notecolumn.tex
+% Copyright (c) Markus Kohm, 2013-2014
+%
+% This file is part of the LaTeX2e KOMA-Script bundle.
+%
+% This work may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c of the license.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later and of this work.
+%
+% This work has the LPPL maintenance status "author-maintained".
+%
+% The Current Maintainer and author of this work is Markus Kohm.
+%
+% This work consists of all files listed in manifest.txt.
+% ----------------------------------------------------------------------
+% scrlayer-notecolumn.tex
+% Copyright (c) Markus Kohm, 2013-2014
+%
+% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
+% Version 1.3c, verteilt und/oder veraendert werden.
+% Die neuste Version dieser Lizenz ist
+% http://www.latex-project.org/lppl.txt
+% und Version 1.3c ist Teil aller Verteilungen von LaTeX
+% Version 2005/12/01 oder spaeter und dieses Werks.
+%
+% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
+% (allein durch den Autor verwaltet).
+%
+% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm.
+%
+% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
+% ======================================================================
+%
+% Chapter about scrlayer-notecolumn of the KOMA-Script guide
+% Maintained by Markus Kohm
+%
+% ----------------------------------------------------------------------
+%
+% Kapitel ueber scrlayer-notecolumn in der KOMA-Script-Anleitung
+% Verwaltet von Markus Kohm
+%
+% ============================================================================
+
+\KOMAProvidesFile{scrlayer-notecolumn.tex}
+ [$Date: 2014-03-07 09:40:24 +0100 (Fri, 07 Mar 2014) $
+ KOMA-Script guide (chapter:scrlayer-notecolumn)]
+
+\translator{Markus Kohm\and Arndt Schubert}
+
+% Date of the translated file: 2014-03-13
+
+\chapter{Note Columns with \Package{scrlayer-notecolumn}}
\labelbase{scrlayer-notecolumn}
-Sometimes documents need an additional notes column beside the main text
-column and maybe beside the marginal note column. Problematicly may be
-having page breaks inside the notes column. This package provides a
-solution based on the layer interface of \Package{scrlayer}. You may
-define several notes columns, each of them with page breaks
-inside. It supports automatic page break inside of notes and recognises
-note collisions and solve them by moving notes.
-
-The idea of this package raised while an e-mail contact with Heiner
-Richter from FH~Stralsund, who told me of a book project, and asked
-whether or not such a functionality may be added to another package of
-mine easily. It couldn't, but design and implementation of a first test
-alpha of \Package{scrlayer-notecolumn} has been done in about three
-hours. So maybe it was a really good idea to ask me the question.
+\BeginIndex{}{note>columns}%
+\BeginIndex{Package}{scrlayer-notecolumn}%
+Up to version~3.11b \KOMAScript{} supported note columns only by marginal
+notes that get their contents from \Macro{marginpar} and \Macro{marginline}
+(see \autoref{sec:maincls.marginNotes},
+\autopageref{desc:maincls.cmd.marginline}). This kind of note columns has
+several disadvantages:
+\begin{itemize}
+\item Marginal notes can be output only completely on one page. Page
+ breaks\textnote{page break} inside marginal notes are not
+ possible. Sometimes this results in margin notes located close to the lower
+ page margin.
+\item Marginal notes near page breaks sometimes float to the next page and
+ then in
+ case of two-sided layout with alternating marginal notes can be output at
+ the wrong margin.\textnote{put it into the correct margin}. This problem can
+ be solved by additional packages like
+ \Package{mparhack}\IndexPackage{mparhack} or usage of \Macro{marginnote}
+ provided by package \Package{marginnote}\IndexPackage{marginnote}.
+\item Marginal notes inside floating environments\textnote{floating
+ environments} or footnotes\textnote{footnotes} are not possible. This
+ problem can be solved using \Macro{marginnote} of package
+ \Package{marginnote}\IndexPackage{marginnote}, too.
+\item There is only one marginal note column\textnote{several note columns} or
+ at most two, if you work with \Macro{reversemarginpar} and
+ \Macro{normalmarginpar}. You should know, that \Macro{reversemarginpar} is
+ of less usability on two-sided documents.
+\end{itemize}
+Usage of \Package{marginnote}\IndexPackage{marginnote} results in one more
+problem. Because the package does not have any collision detection, marginal
+notes that are set near to each other can partially or totally
+overlap. Moreover, usage of \Macro{marginnote} sometimes and depending on the
+used settings can result in changes of the baseline distance of the normal
+text.
+
+Package \Package{scrlayer-notecolumn} should solve all these problems. To do
+so, it uses the basic functionality of
+\Package{scrlayer}\IndexPackage{scrlayer}. Nevertheless, there is a
+disadvantage of using this package:\textnote{Attention!} Notes can be output
+only on pages that use a \Package{scrlayer} based page style. This
+disadvantage may be easily resolved and maybe changed into an advantage using
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage}.
+
+\section{Note about the State of Development}
+\label{sec:scrlayer-notecolumn.draft}
+
+Originally the package has been made as a so called \emph{proof of
+ concept}\textnote{proof of concept} to demonstrate the potential of
+\Package{scrlayer}. Despite the fact that it currently is in a very early
+state of development, the stability of most parts is less a question of
+\Package{scrlayer-notecolumn} but of \Package{scrlayer}. Nevertheless it is
+assumed that there are still bugs in \Package{scrlayer-notecolumn}. You are
+welcome to report such bugs whenever you find one. Some of the disabilities
+are caused by minimisation of complexity. As an example note columns can break
+to several pages, but there is not a new line break of the paragraphs. \TeX{}
+itself does not provide this.
+
+Because the package is more experimental\textnote{experimental}, the user
+manual belongs to the second part of \iffree{the \KOMAScript{} manual}{this
+ book}, recommended for experienced users. If you are a beginner or
+a user on the way to become an expert\textnote{for experts}, some explanations
+could be ambiguous or incomprehensible. \iffree{Please understand that I try
+ to minimise the effort in time and work for the manual of an experimental
+ package.}
+
+\LoadCommon{0} % \section{Early or late options}
+
+\section{Declaration of new Note Columns}
+\label{sec:scrlayer-notecolumn.declaration}
+
+Loading the package already declares a note column named \PValue{marginpar}
+automatically. The name already adumbrates that this note column is placed in
+the area of the normal marginal note column used by \Macro{marginpar} and
+\Macro{marginline}. It even recognises the setting of \Macro{reversemarginpar}
+and \Macro{normalmarginpar} page by page instead of note by note. So these
+switches are irrelevant when the user defines a note but relevant when the
+package outputs the note during \LaTeX's page building. If you want to use
+notes at the left and at the right margin within one page, you should declare
+at least one more note column.
+
+The default settings for every newly declared note column is the same like
+that of the predefined \PValue{marginpar}. But you can easily change them
+during declaration.
+
+You should note\textnote{Attention!} that note columns can be output only on
+pages that use a page style made with package
+\Package{scrlayer}\IndexPackage{scrlayer}. Package
+\Package{scrlayer-notecolumn} automatically loads \Package{scrlayer}, which by
+default provides only page style \Pagestyle{empty}\IndexPagestyle{empty}. If
+you need additional page styles, the use of
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage} is recommended.
\begin{Declaration}
\Macro{DeclareNoteColumn}%
\OParameter{option list}\Parameter{note column name}%
\\
\Macro{DeclareNewNoteColumn}%
- \OParameter{option list}\Parameter{note column name}\\%^^A
+ \OParameter{option list}\Parameter{note column name}\\%
\Macro{ProvideNoteColumn}%
- \OParameter{option list}\Parameter{note column name}\\%^^A
+ \OParameter{option list}\Parameter{note column name}\\%
\Macro{RedeclareNoteColumn}%
\OParameter{option list}\Parameter{note column name}%
\end{Declaration}
@@ -92,226 +163,512 @@ hours. So maybe it was a really good idea to ask me the question.
\BeginIndex{Cmd}{DeclareNewNoteColumn}%
\BeginIndex{Cmd}{ProvideNoteColumn}%
\BeginIndex{Cmd}{RedeclareNoteColumn}%
-Command \Macro{DeclareNoteColumn}
-may be used to declare a note column. Each note column is referenced by its
-name, defined by the obligatory argument \PName{note column name}. A note
-column vertically span the text area.
-
-By default its horizontal position is the current position of the marginal
-note column. It also regards \Macro{reversemarginpar} and
-\Macro{normalmarginpar}, while output of a note. Note that this is not the
-same like making a margin note. The default width is
-\Length{marginparwidth}. But you may use the optional argument \PName{option
- list} to change this behaviour.
-
-The \PName{option list} is a comma-separated list of
-\texttt{\PName{key}=\PName{value}} options. Currently the following
-\PName{key}s are supported:
-\begin{labeling}[\ --]{\KOption{position}\PName{horizontal offset}}
-\item [\KOption{font}\PName{font declaration}] set the initial font attributes
- to be used for the note column. Everything, that is allowed to be set by
- \Macro{setkomafont} or \Macro{addtokomafont} can be used as
- \PName{font declaration}. Note, that
- \Macro{normalfont}\Macro{normalsize} will be used
- before. So you don't need one of them at your own initialisation.
-\item [\Option{marginpar}] set up \Option{position} and \Option{width} to use
- the marginal note column of \Macro{marginpar}.
-\item [\Option{normalmarginpar}] set up \Option{position} and \Option{width}
- to use the normal marginal note column and ignore \Macro{reversemarginpar}
- and \Macro{normalmarginpar}.
-\item [\KOption{position}\PName{horizontal offset}] set up the horizontal
- offset of the note column from the left edge of the paper. The
- \PName{horizontal offset} can be either a \LaTeX{} length, a \TeX{}
- dimension, a \TeX{} skip, a length value, or a dimensional expression using
- \texttt{+}, \texttt{-}, \texttt{*}, \texttt{/} and parenthesis (see
- \cite[section~3.5]{manual:eTeX} for more information about dimensional
- expressions). The value will be calculated at usage time not at definition
- time. So you may even use more complex constructs like:
-\begin{lstcode}
- \ifodd\value{page}
- \oddsidemargin+1in
- +\textwidth+\marginparsep
- \else
- \evensidemargin+1in
- -\marginparsep
- -\marginparwidth
- \fi
-\end{lstcode}
-\item [\Option{reversemarginpar}] set up \Option{position} and \Option{width}
- to use the reverse marginal note column and ignore \Macro{reversemarginpar}
- and \Macro{normalmarginpar}.
-\item [\KOption{width}\PName{size}] set up the horizontal size of the note
- column. You can use the same values for \PName{size} like for
- \PName{horizontal offset} of option \Option{position}.
-\end{labeling}
-
-You may use as much note columns as \LaTeX{} provides free box registers,
-because every note column needs one box register. You may use package
-\Package{etex} to increase the normal amount of box registers from 256 to
-32768. This should be enough to avoid the ``\texttt{no room for
- \Macro{newbox}}'' error.
-
-The implementation of note columns uses foreground layers from package
-\Package{scrlayer}. Every \Macro{DeclareNoteColumn} generates a layer and adds
-this layer to the pseudo page style \Pagestyle{@everystyle@}. Theoretically
-you may modify the generated layer, but it is recommended not to modify them.
-
-Overlapping of different note columns is allowed. There's one predefined note
-column named ``\texttt{marginpar}''.
+These commands can be used to declare note columns. \Macro{DeclareNoteColumn}
+declares the note column independent of whether or not they already
+exist. \Macro{DeclareNewNoteColumn} throws an error message if \PName{note
+ column name} has already been used for another note
+column. \Macro{ProvideNoteColumn} simply does nothing in the same
+case. \Macro{RedeclareNoteColumn} can be used only to declare an already
+existing note column again.
+
+By the way: Already existing notes of a already existing note column are not
+lost if you re-declare it using \Macro{DeclareNoteColumn} or
+\Macro{RedeclareNoteColumn}.
\BeginIndex{FontElement}{notecolumn.\PName{note column name}}%
-Note, that if you change the initial font using
-\begin{quote}
- \Macro{setkomafont}\linebreak[1]\PParameter{marginnote.\PName{note column
- name}}\Parameter{font declaration}
-\end{quote}
-or
-\begin{quote}
- \Macro{addtokomafont}\linebreak[1]\PParameter{marginnote.\PName{note column
- name}}\Parameter{font declaration}
-\end{quote}
-the font of all succeeding note column outputs would change. This could make it
-hard to find out, which notes will be affected by the change.
-See \autoref{sec:maincls.textmarkup},
-\autopageref{desc:maincls.cmd.setkomafont} for more information about
-\Macro{setkomafont} and \Macro{addtokomafont}.%
+\BeginIndex{FontElement}{notecolumn.marginpar}%
+Declaring a new note column does also define a new element of which you can
+change the font attributes using \Macro{setkomafont} and \Macro{addtokomafont}
+if such a element does not already exist. The name of the new element is
+\PValue{notecolumn.}\PName{note column name}. Because of this the predefined
+note column \PValue{marginnote} has a element
+\FontElement{notecolumn.marginpar}. The initial setting of the element's font
+can be done using option \Option{font} as part of the \PName{option list}.%
\EndIndex{FontElement}{notecolumn.\PName{note column name}}%
+\EndIndex{FontElement}{notecolumn.marginpar}%
+
+The \PName{option list} is a comma separated list of keys with or without
+values, also known as options. The available options are shown in
+\autoref{tab:scrlayer-notecolumn.note.column.options}. Option\textnote{default:
+ option \Option{marginpar}} \Option{marginpar} is set by default. But you can
+overwrite this default with your individual settings.
+
+\begin{table}
+ \caption[Options for the declaration of note columns]%
+ {%
+ Options for the declaration of note columns%
+ }%
+ \label{tab:scrlayer-notecolumn.note.column.options}%
+ \begin{desctabular}
+ \entry{\KOption{font}\PName{font declaration}}{%
+ The initial font attributes to be used for the note column. Everything,
+ that is allowed to be set by \Macro{setkomafont} or
+ \Macro{addtokomafont} can be used as \PName{font declaration} (see
+ \autoref{sec:maincls.textmarkup},
+ \autopageref{desc:maincls.cmd.setkomafont}). Note that
+ \Macro{normalfont}\Macro{normalsize} will be used before. So you don't
+ need one of them at your own initialisation.\par%
+ Default: \emph{empty}%
+ }%
+ \entry{\Option{marginpar}}{%
+ Sets up \Option{position} and \Option{width} to use the marginal note
+ column of \Macro{marginpar}. Note that this option does not expect or
+ allow any value.\par%
+ Default: \emph{yes}%
+ }%
+ \entry{\Option{normalmarginpar}}{%
+ Sets up \Option{position} and \Option{width} to use the normal marginal
+ note column and ignore \Macro{reversemarginpar} and
+ \Macro{normalmarginpar}. Note that this option does not expect or allow
+ any value.\par%
+ Default: \emph{no}%
+ }%
+ \entry{\KOption{position}\PName{offset}}{%
+ Sets up the horizontal offset of the note column from the left edge of
+ the paper. The \PName{horizontal offset} can be either a \LaTeX{}
+ length, a \TeX{} dimension, a \TeX{} skip, a length value, or a
+ dimensional expression using \texttt{+}, \texttt{-}, \texttt{*},
+ \texttt{/} and parenthesis (see \cite[section~3.5]{manual:eTeX} for more
+ information about dimensional expressions). The value will be calculated
+ at usage time not at definition time.\par%
+ Default: \emph{by option \Option{marginpar}}%
+ }%
+ \entry{\Option{reversemarginpar}}{%
+ Sets up \Option{position} and \Option{width} to use the reverse marginal
+ note column and ignore \Macro{reversemarginpar} and
+ \Macro{normalmarginpar}. Note that this option does not expect or allow
+ any value.\par%
+ Default: \emph{no}%
+ }%
+ \entry{\KOption{width}\PName{length}}{%
+ Sets up the horizontal size of the note column. You can use the same
+ values for \PName{size} like for \PName{offset} of option
+ \Option{position}.\par%
+ Default: \emph{by option \Option{marginpar}}%
+ }%
+ \end{desctabular}
+\end{table}
+
+Because note columns are implemented using \Package{scrlayer}, each note
+column also defines a layer\Index{layer}. The name\textnote{layer's name} of
+the layer is the same as the name of the element,
+\PValue{notecolumn.}\PName{note column name}. For more information about
+layers see \autoref{sec:scrlayer.layers}, from
+\autopageref{sec:scrlayer.layers}.
+%
+\begin{Example}
+ Assuming, you are a German professor of weird rights and like to write a
+ paper about the new ``Gesetz über die ausgelassene Verbreitung allgemeiner
+ Späße e'', GüdaVaS. The main focus of the work should consist of comments to
+ each section. So you use a two-columned layout. The comments would be the
+ main text in the main column. The sections should be placed in a smaller
+ note column on the right side of the main column using a smaller
+ font\iffree{ and a different colour}{}.
+\begin{lstcode}
+ \documentclass{scrartcl}
+ \usepackage[ngerman]{babel}
+ \usepackage{selinput}
+ \SelectInputMappings{
+ adieresis={ä},
+ germandbls={ß},
+ }
+ \usepackage[T1]{fontenc}
+ \usepackage{lmodern}
+ \usepackage{xcolor}
+
+ \usepackage{scrjura}
+ \setkomafont{contract.Paragraph}{\bfseries}
+ \setkeys{contract}{preskip=-\dp\strutbox}
-The difference between \Macro{DeclareNoteColumn} and the other commands is,
-that \Macro{DeclareNoteColumn} defines the note column independent whether a
-note column with the same name has already been defined or
-not. \Macro{DeclareNewNoteColumn} defined only note columns which names are
-not yet used for another note column. It's an error to use it with an already
-used \PName{note column name}. \Macro{ProvideNoteColumn} is like
-\Macro{DeclareNewNoteColumn}, but if the \PName{note column name} is already
-used for a note column nothing happens. \Macro{RedeclareNoteColumn} may be
-used to declare a note column with a name, that is already used. Using it with
-a new name is an error.
-\EndIndex{Cmd}{RedeclareNoteColumn}%^^A
-\EndIndex{Cmd}{ProvideNoteColumn}%^^A
-\EndIndex{Cmd}{DeclareNewNoteColumn}%^^A
-\EndIndex{Cmd}{DeclareNoteColumn}%^^A
+ \usepackage{scrlayer-scrpage}
+ \usepackage{scrlayer-notecolumn}
+
+ \newlength{\paragraphscolwidth}
+ \AfterCalculatingTypearea{%
+ \setlength{\paragraphscolwidth}{%
+ .333\textwidth}%
+ \addtolength{\paragraphscolwidth}{%
+ -\marginparsep}%
+ }
+ \recalctypearea
+ \DeclareNewNoteColumn[%
+ position=\oddsidemargin+1in
+ +.667\textwidth
+ +\marginparsep,
+ width=\paragraphscolwidth,
+ font=\raggedright\footnotesize
+ \color{blue}
+ ]{paragraphs}
+\end{lstcode}
+ The paper should be a single-sided article. The German language (new
+ spelling) is selected with package \Package{babel}\IndexPackage{babel}. The
+ input encoding is selected and detected with package
+ \Package{selinput}\IndexPackage{selinput} automatically. The font is Latin
+ Modern in 8-bit coding.\iffree{ The colour selection uses package
+ \Package{xcolor}\IndexPackage{xcolor}.}{}
+
+ For usage of package \Package{scrjura}\IndexPackage{scrjura} to typeset laws
+ and contracts see \iffree{the German manual of that
+ package}{\autoref{cha:scrjura}}.
+
+ Next package \Package{scrlayer-notecolumn}\textnote{note columns with
+ \Package{scrlayer-notecolumn}} is loaded. The required width of the note
+ column is calculated within \Macro{AfterCalculatingTypearea} after package
+ \Package{typearea}'s each new calculation of the typing area. It should be
+ one third of the typing area minus the distance between the main text and
+ the note column. %
+
+ With all this information we define the new note column. For
+ the positions we simply use a dimension expression. Doing so, we have to
+ note that \Length{oddsidemargin} is not the total left margin but for
+ historical reasons the left margin minus 1\Unit{inch}. So we have to add
+ this value.
+
+ That is all of the declaration. But we have to note that currently the note
+ column would be output inside the typing area. This means that the note
+ column would overwrite the text.
+
+\begin{lstcode}
+ \begin{document}
+
+ \title{Kommentar zum GüdaVaS}
+ \author{Professor R. O. Tenase}
+ \date{11.\,11.~2011}
+ \maketitle
+ \tableofcontents
+
+ \section{Vormerkung}
+ Das GüdaVaS ist ohne jeden Zweifel das wichtigste
+ Gesetz, das in Spaßmanien in den letzten eintausend
+ Jahren verabschiedet wurde. Die erste Lesung fand
+ bereits am 11.\,11.~1111 im obersten spaßmanischen
+ Kongress statt, wurde aber vom damaligen Spaßvesier
+ abgelehnt. Erst nach Umwandlung der spaßmanischen,
+ aberwitzigen Monarchie in eine repräsentative,
+ witzige Monarchie durch W. Itzbold,
+ den Urkomischen, am 9.\,9.~1999 war der Weg für
+ dieses Gesetz endlich frei.
+\end{lstcode}
+ Because the text area has not been reduced\textnote{Attention!}, the
+ preamble is output with the whole width of the typing area. To test this,
+ you can temporarily add:
+\begin{lstcode}
+ \end{document}
+\end{lstcode}
+\end{Example}
+%
+Until now, the example does not give any answer to the question, how the text
+of the comments will be printed with a smaller width. You will find this in
+the continuation of the example below.%
+\EndIndex{Cmd}{RedeclareNoteColumn}%
+\EndIndex{Cmd}{ProvideNoteColumn}%
+\EndIndex{Cmd}{DeclareNewNoteColumn}%
+\EndIndex{Cmd}{DeclareNoteColumn}%
+
+\section{Making a Note}
+\label{sec:scrlayer-notecolumn.makenote}
+
+After having declared a note column, we can make notes for this column. But
+these notes will not be output immediately. Instead of this, they are written
+into a helper file with extension ``\File{.slnc}''. If you want to know the
+exactly workout: First they are written to the \File{aux}-file and while
+reading the \File{aux}-file inside of \Macro{end}\PParameter{document} they
+will be copied to the \File{slnc}-file. Thereby setting of
+\Macro{nofiles}\IndexCmd{nofiles} will be respected. At the next \LaTeX{} run,
+the helper file will be read step by step depending on the progress of the
+document and at the end of the page the note will be output.
+
+But you should note\textnote{Attention!} that note columns are output only in
+pages with a page style of package
+\Package{scrlayer}\IndexPackage{scrlayer}. This package will be loaded by
+\Package{scrlayer-notecolumn} automatically and by default provides only one
+page style, \Pagestyle{empty}\IndexPagestyle{empty}. Usage of additional
+package \Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage} is
+recommended, if you need more page styles.
\begin{Declaration}
- \Macro{makenote}%
- \OParameter{note column name}\Parameter{note text}
+ \Macro{makenote}\OParameter{note column name}\Parameter{note}
\end{Declaration}
\BeginIndex{Cmd}{makenote}%
-This command
-may be used to make a new note. The note will be written to a helper file with
-extension \File{.slnc} in this run. In the next run, it will be
-typeset. Normally it will be typeset with the same vertical position, that
-would be used for a \Macro{parbox[t]}, but horizontally moved to the note
-column. Collisions at this position of this note column (but not of other note
-columns) will be recognised. In such a case the note may be moved down and
-even to another page. Automatic page breaks at the note columns are
-supported. This is something different to \Macro{marginpar},
-\Macro{marginline} (\KOMAScript{} classes), or \Macro{marginnote} (package
-\Package{marginnote}).
-
-Note, that after changing the document, at least two \LaTeX{} runs are needed
-to move the note to its final position.
-
-Note, that fragile commands should be protected to avoid error messages while
-writing or reading the helper file.
-
-Note, that \Package{scrlayer-notecolumn} needs only one helper file for all
-note columns together. You should not edit or change that helper file, because
-the syntax is fragile. It won't be read using \Macro{input} but
-\Macro{read}. Because of this, line breaks, empty lines and \Macro{par} should
-be avoided.
-
-Currently it is unknown where you may use \Macro{makenote} and where not. But
-you must not use \Macro{makenote} inside of \Macro{makenote}!
-
-The default for the optional argument \PName{makenote} is \PValue{marginpar},
-that is the \PName{note column name} of the pre-defined note column.
-\EndIndex{Cmd}{makenote}
+This command may be used to make a new \PName{note}. The current vertical
+position is used as the vertical position of the start of the
+\PName{note}. The horizontal position depends only on the defined position of
+the note column. To work correct, the package needs
+\Macro{pdfsavepos}\IndexCmd{pdfsavepos},
+\Macro{pdflastypos}\IndexCmd{pdflastypos}, and
+\Macro{pdfpageheight}\IndexLength{pdfpageheight}. Without these primitives
+\Package{scrlayer-notecolumn} cannot be used. The primitives should act
+exactly as they would using PDF\TeX.
+
+However, if the package recognises a collision\textnote{collision avoidance}
+with the output of a former \PName{note}, then the new \PName{note} will be
+delayed until the end of the former \PName{note}. If the \PName{note} does not
+fit into the page\textnote{page break}\Index{page>break}, it will be moved at
+whole or only at part to the next page.
+
+The optional argument \PName{note column name} determines which note column
+should be used for the \PName{note}. The predefined note column
+\PValue{marginpar} is used, if the optional argument is omitted.%
+\begin{Example}
+ Let's add a commented section into the example of the previous section. The
+ section itself is put into the note column:
+\begin{lstcode}
+ \section{Analyse}
+ \begin{addmargin}[0pt]{.333\textwidth}
+ \makenote[paragraphs]{%
+ \protect\begin{contract}
+ \protect\Paragraph{%
+ title={Kein Witz ohne Publikum}%
+ }
+ Ein Witz kann nur dort witzig sein, wo er
+ auf ein Publikum trifft.
+ \protect\end{contract}%
+ }
+ Dies ist eine der zentralsten Aussagen des
+ Gesetzes. Sie ist derart elementar, dass es
+ durchaus angebracht ist, sich vor der Weisheit
+ der Verfasser zu verbeugen.
+\end{lstcode}
+ Environment \Environment{addmargin}\IndexEnv{addmargin}\textnote{column
+ width by \Environment{addmargin}}, which is described in
+ \autoref{sec:maincls.lists}, \autopageref{desc:maincls.env.addmargin}, is
+ used to reduce the width of the main text by the width of the section column.
+
+ Here you can see one of the few problems of using
+ \Macro{makenote}. Because the mandatory argument will be written into a
+ helper file, commands\textnote{fragile commands} inside this argument
+ unfortunately can \emph{break}. To avoid this, it is recommended to use
+ \Macro{protect} in front of all commands that should not expand while
+ writing the helper file. Otherwise using a command inside this argument
+ could result in an error message.
+
+ In principle you could finish this example already with:
+\begin{lstcode}
+ \end{addmargin}
+ \end{document}
+\end{lstcode}
+ to see a first result.
+\end{Example}
+If you'll test this example, you will see that the \PName{paragraphs} column
+is longer than the comment. If you would\textnote{Attention!} add one more
+paragraph with one more section and comment, you may have the problem, that
+the new command will be put immediately after the comment above and not after
+the section. So the new section would move away from the corresponding
+comment. Next we will get a solution of this problem.%
+\EndIndex{Cmd}{makenote}%
+
\begin{Declaration}
- \KOption{autoclearnotecolumns}\PName{simple switch}\\
- \Macro{clearnotecolumn}\OParameter{name of a note column}%
- \\
- \Macro{clearnotecolumns}\OParameter{list of note column names}
+ \Macro{syncwithnotecolumn}\OParameter{note column name}
\end{Declaration}
-\BeginIndex{Cmd}{clearnotcolumn}%
-\BeginIndex{Cmd}{clearnotcolumns}%
-The commands
-may be used to output all hanging notes for either one or several note
-columns. With \Macro{clearnotecolumn} only the notes of the note column with
-the given \PName{name of a note column} will be output. If you omit the
-optional argument (this is not the same like using an empty value!) note
-column \PValue{marginnote} will be used.
-
-With \Macro{clearnotecolumns} the notes of all note columns of the comma
-separated \PName{list of note column names} will be output. If you omit the
-optional Argument or if the optional Argument is empty (or start with
-\Macro{relax}) the notes of all note columns will be output.
-
-Macro \Macro{clearpage} will be used to output hanging notes and several
-\LaTeX{} runs may be needed to terminate with the correct number of
-\Macro{clearpage} for the whole document. You will get the message ``\LaTeX{}
-Warning: Label(s) may have changed. Rerun to get cross-references right.'' as
-long as the process hasn't been terminated.
-
-But normally you don't need to us \Macro{clearnotecolum} or
-\Macro{clearnotecolumns} yourself. Because by default option
-\Option{autoclearnotecolumns} is switched on, which means, that
-\Macro{clearnotecolumns} will be done at every \Macro{clearpage}. You may
-change this, switching off \Macro{autoclearnotecolumns} using one of the
-values for simple switches.
-
-Note, that it is not allowed to use \Macro{clearnotecolumn} or
-\Macro{clearnotecolumns} inside a note. You can use these commands only inside
-the main text of the document.%
-\EndIndex{Cmd}{clearnotcolumns}%
-\EndIndex{Cmd}{clearnotcolumn}%
+\BeginIndex{Cmd}{syncwithnotecolumn}%
+This command adds a
+synchronisation\textnote{synchronisation}\Index{synchronisation} point into
+the note column and into the main text of the document. Whenever a
+synchronisation point is found while output of a note column or the main text,
+a mark will be generated that consists of the current page and the current
+vertical position.
+
+Together with the generation of synchronisation points it is recognised
+whether a mark has been set into the note column or the main text while the
+previous \LaTeX{} run. If so, the values will be compared. If the mark of the
+note column is lower at the current page or on a later page, the main text
+will be moved down to the position of the mark.
+
+It is recommended to use synchronisation points\textnote{Note!} not inside
+paragraphs of the main text but only between paragraphs. If you use
+\Macro{syncwithnotecolumn} inside a paragraph, the synchronisation point will
+be delayed until the current line has been output. This behaviour is similar
+to the usage of, e.\,g., \Macro{vspace}\IndexCmd{vspace}.
+
+Because recognition of synchronisation points can be done first at the next
+\LaTeX{} run,\textnote{several \LaTeX{} runs}, the mechanism needs at least
+three \LaTeX{} runs. Because of the new synchronisation later synchronisation
+points may be moved. This would result in the need of additional \LaTeX{}
+runs. You should have a look at the message: ``\LaTeX{} Warning: Label(s) may
+have changed. Rerun to get cross-references right.''to find out whether or not
+additional \LaTeX{} runs are needed.
+
+If you do not use the optional argument, the predefined note column
+\PValue{marginpar} will be used. Please note, an empty optional argument is
+not the same as omitting the optional argument!
+
+You must not use\textnote{Attention!} \Macro{syncwithnotecolumn} inside a note
+itself, this means inside the mandatory Argument of
+\Macro{makenote}\IndexCmd{makenote}! Currently the package cannot recognise
+such a mistake and would result in synchronisation point movement at each
+\LaTeX{} run. So the process will never terminate. So synchronise two or more
+note columns, you have to synchronise each of them with the main text. The
+recommended command for this will be described next.%
+%
+\begin{Example}
+ Let's extend the example above, now by adding a synchronisation point
+ and one more section with one more comment:
+\begin{lstcode}
+ \syncwithnotecolumn[paragraphs]\bigskip
+ \makenote[paragraphs]{%
+ \protect\begin{contract}
+ \protect\Paragraph{title={Komik der Kultur}}
+ \setcounter{par}{0}%
+ Die Komik eines Witzes kann durch das
+ kulturelle Umfeld, in dem er erzählt wird,
+ bestimmt sein.
+
+ Die Komik eines Witzes kann durch das
+ kulturelle Umfeld, in dem er spielt,
+ bestimmt sein.
+ \protect\end{contract}
+ }
+ Die kulturelle Komponente eines Witzes ist
+ tatsächlich nicht zu vernachlässigen. Über die
+ politische Korrektheit der Nutzung des
+ kulturellen Umfeldes kann zwar trefflich
+ gestritten werden, nichtsdestotrotz ist die
+ Treffsicherheit einer solchen Komik im
+ entsprechenden Umfeld frappierend. Auf der
+ anderen Seite kann ein vermeintlicher Witz im
+ falschen kulturellen Umfeld auch zu einer
+ echten Gefahr für den Witzeerzähler werden.
+\end{lstcode}
+ Beside the synchronisation point a vertical distance is added by
+ \Macro{bigskip} to better separate the section and the corresponding
+ comments.
+
+ Again\textnote{Attention}, one more potential problem is shown. Because the
+ note columns uses boxes, that are build and split, counters\textnote{counter
+ in note column} inside note columns can sometimes jitter. In the example
+ the first paragraph would be numbered 2 instead of 1. This can easily be
+ fixed by a courageous reset of the counter.
+
+ Now, the example is almost finished. You just have to finish the
+ environments:
+\begin{lstcode}
+ \end{addmargin}
+ \end{document}
+\end{lstcode}
+ In fact, all other section of the law should also be commented. But let us
+ focus on the main purpose.
+\end{Example}
+But stop! What, if the section in the \PName{paragraphs}
+note column wouldn't fit to the last page? Would it be output on the next
+pages? We will answer this question in the next paragraph.%
+\EndIndex{Cmd}{syncwithnotecolumn}%
\begin{Declaration}
- \Macro{syncwithnotecolumn}\OParameter{name of a note column}%
- \\
- \Macro{syncwithnotecolumns}\OParameter{list of note column names}%
+ \Macro{syncwithnotecolumns}\OParameter{list of note column names}
\end{Declaration}
-\BeginIndex{Cmd}{syncwithnotecolumn}%
\BeginIndex{Cmd}{syncwithnotecolumns}%
-These commands
-may be used to synchronise the vertical position of the main text with one or
-several note columns. If you use the optional argument of
-\Macro{syncwithnotecolumn} it should be one \PName{name of a note column}. If
-you omit it, \PValue{marginpar} will be used as the \PName{name of a note
- column}. Usage of \Macro{syncwithnotecolumn} is exactly the same like usage
-of \Macro{syncwithnotecolumns} with exactly one \PName{name of a note column}.
-
-The optional argument of \Macro{syncwithnotecolumns} is a comma-separated list
-of names of note columns. If you omit this optional argument or if you use an
-empty argument or if the argument starts with \Macro{relax} synchronisation
-will be done with all declared note columns.
-
-Synchronisation with a note column means, that the current position of the
-main text will be changed to be the current vertical position of the note
-column after cleaning the note column. This differs in several point from
-cleaning a note column:
-\begin{itemize}
-\item After cleaning a note column the text position would change to be at a
- new page, even if the note column doesn't fill the whole page
- before. Synchronisation will change the vertical position just after the
- last vertical position of the note column.
-\item Cleaning a note column needs less \LaTeX{} runs than synchronising a
- note column.
-\end{itemize}
-Both, cleaning an synchronising a note column, uses the label mechanism of
-\LaTeX{} without using \Macro{label}, \Macro{ref}, or \Macro{pageref} itself
-(but \Macro{newlabel}). So you should have a look at \LaTeX{} rerun messages,
-because of undefined or changed labels.
-
-Note, that it is not allowed to use \Macro{syncwithnotecolumn} or
-\Macro{syncwithnotecolumns} inside a note. If you do so, you need endless
-\LaTeX{} runs without reaching a final state. But synchronisation of several
-note columns in the main text of a document will also synchronise the notes
-columns with each others.%
-\EndIndex{Cmd}{syncwithnotecolumns}
-\EndIndex{Cmd}{syncwithnotecolumn}
-
-\endinput
-%%
-%% End of file `scrlayer-notecolumn.tex'.
+This command will synchronise the main text with all note columns of the
+comma-separated \PName{list of note column names}. To do so, the main text
+will be synchronised with the note column, that have the mark closest to the
+end of the document. As a side effect the note columns will be synchronised
+with each other.
+
+If the optional argument is omitted or empty (or begins with \Macro{relax}),
+synchronisation will be done with all currently declared note columns.%
+\EndIndex{Cmd}{syncwithnotecolumns}%
+
+
+\section{Force Output of Note Columns}
+\label{sec:scrlayer-notecolumn.clearnotes}
+
+Sometimes it is necessary to have not only the normal note column output but
+to be able to output all notes that haven't been output already. An example
+for this effort could be that large notes result in moving lots of notes to
+new pages. A good occasion to force the output\textnote{force output} could be
+the end of a chapter or the end of the document.
+
+\begin{Declaration}
+ \Macro{clearnotecolumn}\OParameter{note column name}
+\end{Declaration}
+\BeginIndex{Cmd}{clearnotecolumn}%
+This command can be used to force the output of all notes\textnote{delayed
+ notes} of a selected note column that haven't been output until the end of
+the current page, but has been made in this page or previous pages. To force
+the output empty pages will be generated. During the output of the delayed
+notes of the selected note column, notes of other note columns are also output,
+but only as long as there are still delayed notes of the selected note column.
+
+During the output of the delayed notes, notes may be output by mistake that
+have been placed to one of the inserted empty pages in the previous \LaTeX{}
+run. This will be solved automatically by one of the next \LaTeX{}
+runs. You can realise such movement of notes by the message: ``\LaTeX{}
+Warning: Label(s) may have changed. Rerun to get cross-references right.''
+
+The note column related to the output, is given by the optional
+argument, \PName{note column name}. If this argument is omitted, the notes of
+the predefined note column \PValue{marginpar} will be output.
+
+Attentive readers\textnote{forced output cs. synchronisation} will have noticed
+that the forced output is something similar to the synchronisation. But if the
+forced output really results in an output you will be at the start of a new
+page and not just at the end of the output afterwards. Nevertheless, a
+forced output terminates with less \LaTeX{} runs.%
+\EndIndex{Cmd}{clearnotecolumn}%
+
+\begin{Declaration}
+ \Macro{clearnotecolumns}\OParameter{list of note column names}
+\end{Declaration}
+\BeginIndex{Cmd}{clearnotecolumns}%
+This command is similar to \Macro{clearnotecolumns} with the difference that
+the optional argument is not only the name of one note column but a
+comma-separated \PName{list of note column names}. It forces the output of the
+notes of all these note columns.
+
+If you omit the optional argument, all delayed notes of all note columns will
+be output.%
+\EndIndex{Cmd}{clearnotecolumns}%
+
+\begin{Declaration}
+ \KOption{autoclearnotecolumns}\PName{simple switch}
+\end{Declaration}
+\BeginIndex{Option}{autoclearnotecolumns}%
+Usually you would like to force the output of notes whenever a document
+implicitly\,---\,e.\,g. because of a \Macro{chapter} command\,---\,or
+explicitly executes \Macro{clearpage}. Note that this is also the case at the
+end of the document inside \Macro{end}\PParameter{document}. Option
+\Option{autoclearnotecolumns} manages whether or not \Macro{clearpage} should
+also executes \Macro{clearnotecolumns} without any optional argument.
+
+According to the author's preference the option is active by
+default. But you can change this with proper values for simple switches (see
+\autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}) at any time.
+
+You should note, that deactivation of the option can result in lost notes at
+the end of the document. So you should insert \Macro{clearnotecolumns} before
+\Macro{end}\PParameter{document} if you deactivate the option.
+
+This should answer the question from the end of the last section. By default
+the section would be output even if it would need the output of one more
+page. But because this would be done after the end of the
+\Environment{addmargin} environment, the forced output could overlap with main
+text after that environment. So it would be useful to either add one more
+synchronisation point or to force the output explicitly immediately at the
+end of the \Environment{addmargin} environment.
+
+The result of the example is shown in
+\autoref{fig:scrlayer-notecolumn.example}.\iffree{}{ Only the colour has been
+ changed from blue into grey.}
+
+\begin{figure}
+ \KOMAoptions{captions=bottombeside}%
+ \setcapindent{0pt}%
+ \begin{captionbeside}[{An example page to the example of
+ \autoref{cha:scrlayer-notecolumn}}]{An example page to the example of
+ this chapter\label{fig:scrlayer-notecolumn.example}}[l]
+ \frame{\includegraphics[width=.5\textwidth,keepaspectratio]%
+ {scrlayer-notecolumn-example}}
+ \end{captionbeside}
+\end{figure}
+\EndIndex{Option}{autoclearnotecolumns}%
+%
+\EndIndex{Package}{scrlayer-notecolumn}%
+\EndIndex{}{note>columns}%
+
+%%% Local Variables:
+%%% mode: latex
+%%% mode: flyspell
+%%% coding: iso-latin-1
+%%% ispell-local-dictionary: "en_GB"
+%%% TeX-master: "../guide"
+%%% End:
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage-experts.tex
index ba5a99e60b3..cef1c018a29 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage-experts.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage-experts.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrlayer-scrpage-experts.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrlayer-scrpage-experts.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -44,11 +44,11 @@
% ============================================================================
\KOMAProvidesFile{scrlayer-scrpage-experts.tex}%
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-01-24 14:08:15 +0100 (Fri, 24 Jan 2014) $
KOMA-Script guide (chapter: scrlayer-scrpage-experts)]
\translator{Markus Kohm}
-% Date version of the translated file: 2013-10-28
+% Date version of the translated file: 2014-01-22
\chapter[{Additional Features of \Package{scrlayer-scrpage}}]
{Additional Features\ChangedAt{v3.12}{\Package{scrlayer-scrpage}} with
@@ -57,32 +57,31 @@
%
\BeginIndex{Package}{scrlayer-scrpage}%
Package \Package{scrlayer-scrpage} provides features that have not been
-described in \autoref{cha:scrlayer-scrpage} of \autoref{part:forAuthors} of this
-\iffree{user guide}{book}. But the most average user will not need those
-extensions and some of them are only implemented for compatibility with
-\Package{scrpage2}. So most users do not need to know them. Therefore all those
-things are described here in \autoref{part:forExperts} only.
+described in \autoref{cha:scrlayer-scrpage} of this \iffree{user
+ guide}{book}'s \autoref{part:forAuthors}. In general, the average user will
+not need those extensions and some of them are only provided for
+compatibility with \Package{scrpage2}.
\section{Definition of new Pairs of Page Styles}
\label{sec:scrlayer-scrpage.pagestyle.pairs}
In \autoref{sec:scrlayer-scrpage.predefined.pagestyles} the page styles
\Pagestyle{scrheadings} and \Pagestyle{plain.scrheadings} have been
-described. Those build quasi a pair of page styles, with
-\Pagestyle{scrheadings} as the main page style with running head and
-\Pagestyle{plain.scrheadings} as the corresponding \Pagestyle{plain} page
-style without running head but generally with pagination. Beside the
+described. These can be seen as a pair of page styles, with
+\Pagestyle{scrheadings} being the main page style with a running head and
+\Pagestyle{plain.scrheadings} being the corresponding \Pagestyle{plain} page
+style without running head but generally with pagination. Additionally to the
configuration of these page styles, \Package{scrlayer-scrpage} provides also
the feature of defining new such pairs of page styles. Thereby the name of the
-main page style, e.\,g., \Pagestyle{scrheadings}, is quasi the name of the
+main page style, e.\,g., \Pagestyle{scrheadings}, can be seen as the name of the
pair of page styles.
Most users will not need more than the predefined pair
\Pagestyle{scrheadings}. So the commands of this section may be understood as
-an addition for special cases. And because each such case is very special,
+an addition for special cases. And as each such case is very special,
this section also lacks of handsome examples. Nevertheless, if the support
-will show me a real nice example in future, I perhaps could use it in
-future. Nevertheless, I'm almost sure that all such cases could also be
+will show me a real nice example in the future, I perhaps could use it in
+the future. However, I'm almost sure that all such cases could also be
solved using the predefined pair only.
\begin{Declaration}
@@ -113,38 +112,38 @@ pair of page styles with that name are the initial settings of the new pair of
page styles. So the new pair inherits the configuration of the \PName{parent
pair}.
-While reading \autoref{sec:scrlayer-scrpage.predefined.pagestyles} you might
-have the impression that the commands of this section were related to
-\Pagestyle{scrheadings} and \Pagestyle{plain.scrheadings} only. Nevertheless,
-this is only as long true, as this is the only existing pair of page
-styles. As soon as there exist more pairs of page styles, they are related to
-the pair that has been activated last. In fact, this is the case for \Macro{lehead}, \Macro{cehead}, \Macro{rehead}, \Macro{lohead},
-\Macro{cohead}, \Macro{rohead}, \Macro{lefoot}, \Macro{cefoot},
-\Macro{refoot}, \Macro{lofoot}, \Macro{cofoot}, \Macro{rofoot}, \Macro{ihead},
-\Macro{chead}, \Macro{ohead}, \Macro{ifoot}, \Macro{cfoot}, and \Macro{ofoot}
-from \autoref{sec:scrlayer-scrpage.predefined.pagestyles}.
-
-All those commands and the below described commands \Macro{clearmainofpairofpagestyles}, \Macro{clearplainofpairofpagestyles}, and
-\Macro{clearpairofpagestyles} are also mentioned to be used inside the
-argument \PName{definition}. In that case, they are a kind of default
-configuration of the pair of page styles that will be executed each time the
-pair will be activated. A pair of page styles will be activated, if one of the
-page styles of the pair will be activated. This will be done mostly using
+Reading \autoref{sec:scrlayer-scrpage.predefined.pagestyles} might have
+created the impression that the described commands are related to
+\Pagestyle{scrheadings} and \Pagestyle{plain.scrheadings} only. However, if
+there exist more pairs of page styles, these commands are related to the pair
+that has been activated last. In fact, this is the case for \Macro{lehead},
+\Macro{cehead}, \Macro{rehead}, \Macro{lohead}, \Macro{cohead},
+\Macro{rohead}, \Macro{lefoot}, \Macro{cefoot}, \Macro{refoot},
+\Macro{lofoot}, \Macro{cofoot}, \Macro{rofoot}, \Macro{ihead}, \Macro{chead},
+\Macro{ohead}, \Macro{ifoot}, \Macro{cfoot}, and \Macro{ofoot} of
+\autoref{sec:scrlayer-scrpage.predefined.pagestyles}.
+
+All those commands and the below described commands
+\Macro{clearmainofpairofpagestyles}, \Macro{clearplainofpairofpagestyles}, and
+\Macro{clearpairofpagestyles} are also designed to be used inside the argument
+\PName{definition}. In that case, they are a kind of default configuration of
+the pair of page styles that is executed each time the pair will be
+activated. A pair of page styles is activated, if one of the page styles of
+the pair will be activated, which is mostly done by using
\Macro{pagestyle}\IndexCmd{pagestyle}.
Please note that the commands of
-\autoref{sec:scrlayer-scrpage.pagestyle.content} are for general purpose,
-anyway. So they are related to every page style that has been defined using
-\Package{scrlayer-scrpage}.
-
-Whereas \Macro{defpairofpagestyles} will define a pair independent whether or
-not the corresponding page styles are already defined, will
-\Macro{newpairofpagestyles} and \Macro{providepairofpagestyles} define the pair
-only, if the page styles are currently undefined. If at least one of the page
-styles is already defined, the new definition of
-\Macro{providepairofpagestyles} will be ignored, but usage of
-\Macro{newpairofpagestyles} would result in an error message. To redefine
-already existing pairs of page styles you may use
+\autoref{sec:scrlayer-scrpage.pagestyle.content} are for general
+purpose. Therefore, they are related to every page style that has been defined
+using \Package{scrlayer-scrpage}.
+
+Whereas \Macro{defpairofpagestyles} will define a pair no matter if the
+corresponding page styles are already defined, \Macro{newpairofpagestyles} and
+\Macro{providepairofpagestyles} will define the pair only, if the page styles
+are currently undefined. If at least one of the page styles is already
+defined, the new definition of \Macro{providepairofpagestyles} will be
+ignored, but usage of \Macro{newpairofpagestyles} would result in an error
+message. To redefine already existing pairs of page styles you may use
\Macro{renewpairofpagestyles}. With this an error would be thrown, if at least
one of the page styles of the pair does not already exist.%
\EndIndex{Cmd}{providepairofpagestyles}%
@@ -180,9 +179,9 @@ they are related to the lastly activated pair of page styles.
\BeginIndex{Cmd}{clearscrplain}%
\BeginIndex{Cmd}{clearscrheadfoot}%
The commands \Macro{clearscrheadings}, \Macro{clearscrplain}, and
-\Macro{clearscrheadfoot} are aliases for these commands that have been
-implemented for compatibility with \Package{scrpage2} only. Nevertheless, they
-are deprecated and should not be used any longer.%
+\Macro{clearscrheadfoot} are aliases for these commands provided only for
+compatibility with \Package{scrpage2}. Nevertheless, they are deprecated and
+should not be used.%
\EndIndex{Cmd}{clearscrheadfoot}%
\EndIndex{Cmd}{clearscrplain}%
\EndIndex{Cmd}{clearscrheadings}%
@@ -195,14 +194,13 @@ are deprecated and should not be used any longer.%
\section{Definition of Simple Page Styles with Three Parts in Head and Foot }
\label{sec:scrlayer-scrpage.pagestyle.triple}
-Beside predefined page styles and beside the definition of new pairs of page
-styles, package \Package{scrlayer-scrpage} also provides the Definition of
-page styles with three parts in head and foot. But this user interface exists
-for compatibility with \Package{scrpage2} only. Nevertheless, it has been
-extended to have a more consistent set of commands in difference to
-\Package{scrpage2}. However, for new documents it is recommended to use the
-advanced features that have been described in the previous section, instead
-of the commands of this section.
+Beside predefined page styles and the definition of new pairs of page styles,
+package \Package{scrlayer-scrpage} also provides the definition of page styles
+with three parts in head and foot. But this user interface exists for
+compatibility with \Package{scrpage2} only. However, it has been extended
+beyond the functionality of \Package{scrpage2} to provide a more consistent
+set of commands. Nevertheless, for new documents it is recommended to instead
+use the advanced features described in the previous section.
\begin{Declaration}
\Macro{deftriplepagestyle}%
@@ -262,10 +260,10 @@ of the commands of this section.
\BeginIndex{Cmd}{newtriplepagestyle}%
\BeginIndex{Cmd}{renewtriplepagestyle}%
\BeginIndex{Cmd}{providetriplepagestyle}%
-With these commands you can define a single page style, whose head and foot are
-parted into three elements: an inner element, a centre element, and an outer
-element. The contents of the elements are given three mandatory arguments for
-the head and three mandatory arguments for the foot.
+With these commands you can define a single page style, whose head and foot
+are parted into three elements: an inner element, a centre element, and an
+outer element. The contents of the elements are stated via three mandatory
+arguments for the head and three mandatory arguments for the foot.
Each of the two inner elements will be printed right aligned on left pages and
left aligned on right pages. The centre elements will be printed centred in
@@ -273,7 +271,7 @@ the head respectively foot of left and right pages. Each of the two outer
elements will be printed left aligned on left pages and right aligned on right
pages.
-Please remember once again:\textnote{Attention!} There are only right pages in
+Please note once again:\textnote{Attention!} There are only right pages in
single side layout!
The two optional arguments can be used to activate horizontal lines in the
@@ -288,20 +286,22 @@ argument, this is the \PName{thickness of the inner line}. In this case no
outer line will be printed. And if you omit both optional arguments, both
lines will be omitted.
-Please note\textnote{Attention!} that an empty optional argument is not the
-same like omitting the optional argument! Empty optional arguments are not
-allowed in this case. But you may use simple dimension expressions for the
-optional arguments, like they have been explained for \KOMAScript{} option
-\Option{headwidth} (see \autoref{sec:scrlayer-scrpage.pagestyle.content},
-\autopageref{desc:scrlayer-scrpage.option.headwidth}).
-
-The meaning of the arguments is also shown in
-\autoref{fig:scrlayer-scrpage.triplepagestyle} for an schematic double
-page. Thereby ``\texttt{outer}'', ``\texttt{inner}'', and ``\texttt{centre}''
-are example contents. The corresponding arrows illustrate the expansion of
-those contents. The \iffree{coloured }{}texts inside the pages are only the
-names of the arguments of these commands. The related arrows \iffree{in
- the same colour }{} point to the corresponding elements of the page.
+Please note\textnote{Attention!}, an empty optional argument is not the same
+like omitting the optional argument! Empty optional arguments are not allowed
+in this case. But you may use simple dimension expressions as explained for
+\KOMAScript{} option \Option{headwidth} (see
+\autoref{sec:scrlayer-scrpage.pagestyle.content},
+\autopageref{desc:scrlayer-scrpage.option.headwidth}) for the optional
+arguments.
+
+\hyperref[fig:scrlayer-scrpage.triplepagestyle]%
+{Figure~\ref*{fig:scrlayer-scrpage.triplepagestyle}} shows a sketch for the
+interpretation of the arguments on a schematic double page. Thereby
+``\texttt{outer}'', ``\texttt{inner}'', and ``\texttt{centre}'' are example
+contents. The corresponding arrows illustrate the expansion of those
+contents. The \iffree{coloured }{}texts inside the pages are only the names of
+the arguments of these commands. The related arrows \iffree{in the same colour
+}{} point to the corresponding elements of the page.
\begin{figure}
\centering
@@ -449,15 +449,14 @@ names of the arguments of these commands. The related arrows \iffree{in
\label{fig:scrlayer-scrpage.triplepagestyle}
\end{figure}
-With the commands that are described here, it is not possible to activate only
-a single line, e.\,g., only below the page head but not above the page
-footer. If you need so, you should either use the commands of the previous or
-the following section.
+Using the described commands it is not possible to draw only a single line,
+e.\,g., only below the page head but not above the page footer. If you need
+to do so, please consult the previous or following section.
The length of a single element\textnote{Attention!} is not limited by the
-existence of a neighbour element. So in inappropriate circumstances it can
+existence of a neighbour element. So in unfortunate circumstances it can
happen that one elements overwrites a neighbour element or even both of
-them. The user himself is responsible to avoid such inappropriate cases. With
+them. The user himself is responsible to avoid such inappropriate usage. With
automatic running heads this could, e.\,g., be done using the optional
argument of the section commands. See the manual of the document class for
more information about those commands.
@@ -467,15 +466,15 @@ whether or not a page style with the same \PName{name of the page style}
already exists. In difference to this \Macro{newtriplepagestyle} and
\Macro{providetriplepagestyle} define the page style only, if the \PName{name
of the page style} is not the name of an already defined page
-style. Otherwise \Macro{providepagestyle} will simply do nothing, but
-\Macro{newtriplepagestyle} would throw an error. Command
+style. Otherwise \Macro{providepagestyle} simply does nothing, but
+\Macro{newtriplepagestyle} throws an error. Command
\Macro{renewtriplepagestyle} is something like the opposite of
-\Macro{newtriplepagestyle}. It would throw an error, if there has not been
+\Macro{newtriplepagestyle}. It throws an error, if there has not been
a page style with the \PName{name of the page style} before, and defines the
page style only, if there has been already a page style with the given name.
\BeginIndex{Cmd}{deftripstyle}%
-The command \Macro{deftriplestyle} of \Package{scrpage2} conforms to
+The command \Macro{deftriplestyle} of \Package{scrpage2} corresponds to
\Macro{deftriplepagestyle}. Because of unification reasons it has been renamed
and should not be used with it's old name any longer. Using the old name would
result in a warning message. Nevertheless, the result would be the expected
@@ -490,25 +489,25 @@ one.%
\section{Definition of Complex Page Styles}
\label{sec:scrlayer-scrpage.pagestyle.experts}
-Beside predefined page styles and the definition of new pairs of page styles,
-and beside the definition of page styles with tripartite head and foot that
-are not recommended any longer, package \Package{scrlayer-scrpage} provides
-also a more basic features to define new page styles. All already described
-page style definitions of \Package{scrlayer-scrpage} use internally these basic
-features. Because of the complexity of this user interface it is recommended
-for advanced users only. Less advanced users should be able to reach almost all
-using one of the previously described features. So less advanced users do not
-need to read this section.
-
+Beside predefined page styles, the definition of new pairs of page styles and
+the deprecated definition of page styles with tripartite head and foot, the
+package \Package{scrlayer-scrpage} additionally provides basic features to
+define new page styles. All already described page style definitions of
+\Package{scrlayer-scrpage} use internally these basic features. Because of the
+complexity of this user interface it is recommended for advanced users only.
+As all most all imaginable use cases of page styles can handled using the
+features described previous section, less advanced users may skip this
+section.
+
\begin{Declaration}
\Macro{defpagestyle}%
- \Parameter{name}\Parameter{head definition}\Parameter{foot definition}\\
+ \Parameter{name}\Parameter{head specification}\Parameter{foot specification}\\
\Macro{newpagestyle}%
- \Parameter{name}\Parameter{head definition}\Parameter{foot definition}\\
+ \Parameter{name}\Parameter{head specification}\Parameter{foot specification}\\
\Macro{providepagestyle}%
- \Parameter{name}\Parameter{head definition}\Parameter{foot definition}\\
+ \Parameter{name}\Parameter{head specification}\Parameter{foot specification}\\
\Macro{renewpagestyle}%
- \Parameter{name}\Parameter{head definition}\Parameter{foot definition}%
+ \Parameter{name}\Parameter{head specification}\Parameter{foot specification}%
\end{Declaration}
\BeginIndex{Cmd}{defpagestyle}%
\BeginIndex{Cmd}{newpagestyle}%
@@ -518,63 +517,62 @@ These commands can be used to define a single page style with maximum
flexibility. Thereby \PName{name} is the name of the page style that should
be defined.
-The arguments \PName{head definition} and \PName{foot definition} have
+The arguments \PName{head specification} and \PName{foot specification} have
identical structure:
\begin{quote}\raggedright
\texttt{%
(\PName{length of the line above},\PName{thickness of the line above})\%\\
- \Parameter{definition for the left page in two-side layout}\%\\
- \Parameter{definition for the right page in two-side layout}\%\\
- \Parameter{definition for all pages in one-side laypout}\%\\
+ \Parameter{specification for the left page in two-side layout}\%\\
+ \Parameter{specification for the right page in two-side layout}\%\\
+ \Parameter{specification for all pages in one-side laypout}\%\\
(\PName{length of the line below},\PName{thickness of the line below})%
}
\end{quote}
-Thereby the arguments in the round brackets are options, this means, you may
+The arguments in the round brackets are options. This means, you may
omit them together with the brackets. In that case, the length and thickness
of the corresponding horizontal line would be given by the \KOMAScript{}
options \Option{headtopline}, \Option{headsepline}, \Option{footsepline} or
\Option{footbotline} (see \autoref{sec:scrlayer-scrpage.pagestyle.content},
\autopageref{desc:scrlayer-scrpage.option.headtopline}).
-All three definition arguments are mandatory and will be used depending on the
-page and the layout settings. The contents of the definitions are
-arbitrary. But for page styles with running heads usage of \Macro{headmark},
-\Macro{leftmark}, or \Macro{rightmark} is recommended inside the
-definition. In no case section numbers or section headings should be used in
-the definition. Ignoring this could result in wrong numbers or texts in the
-page head or footer, because of the asynchronous page building of \LaTeX{}.
-
-Command \Macro{defpagestyle} will define the page style independent from
-whether or not a page style with the same \PName{name} already exists. Command
-\Macro{newpagestyle} would throw an error, if such a page style already
-exists. In difference to this, \Macro{providepagestyle} will simple do nothing
-in such a case. In opposite to \Macro{newpagestyle} command
-\Macro{renewpagestyle} would throw the error, if a page style with the
-\PName{name} does not already exist, and therefore may be used to redefine an
-existing page style.
-
-All these commands base on command \Macro{DeclareLayerPageStyle} of package
-\Package{scrlayer} internally. Thereby for a page style \PName{Name} the
-layer \PName{Name}\PValue{.head.above.line} will be defined for the horizontal
-line above the page head, the layer \PName{Name}\PValue{.head.odd} will be
-defined for the page head of odd pages in two-side layout,
-\PName{Name}\PValue{.head.even} will be defined for the page head of even pages
-in two-side layout, \PName{Name}\PValue{.head.oneside} will be defined for the
-page head of all pages in one-side layout, \PName{Name}\PValue{.head.below}
-will be defined for the horizontal line below the page head,
-\PName{Name}\PValue{.foot.above.line} will be defined for the horizontal line
-above the page foot, \PName{Name}\PValue{.foot.odd} will be defined for the
-page foot of odd pages in two-side layout, \PName{Name}\PValue{.foot.even} for
-the page foot of even pages in two-side layout,
-\PName{Name}\PValue{.foot.oneside} for the page foot of all pages in one-side
-layout, and last but not least \PName{Name}\PValue{.foot.below} for the
-horizontal line below the page foot. More information about layers and layer
-page styles can be found from \autopageref{cha:scrlayer} in
-\autoref{cha:scrlayer} also in \autoref{part:forExperts}.%
+All three arguments in the curly brackets are mandatory. They hold arbitrary
+content specifications depending on the page and the layout settings. But for
+page styles with running heads usage of \Macro{headmark}, \Macro{leftmark}, or
+\Macro{rightmark} is recommended inside the specification. Section numbers or
+section headings must not be used in the specifications. Due to the
+asynchronous page building of \LaTeX, using them could result in wrong numbers
+or texts in the page header or footer.
+
+Command \Macro{defpagestyle} defines the page style no matter if a page style
+with the same \PName{name} already exists. Command \Macro{newpagestyle} would
+throw an error, if such a page style already exists. In contrast to this,
+\Macro{providepagestyle} simple does nothing in such a case. In contrast to
+\Macro{newpagestyle} command \Macro{renewpagestyle} throws an error, if a page
+style with the \PName{name} does not already exist, and therefore may be used
+to redefine an existing page style.
+
+All these commands are based on the command \Macro{DeclareLayerPageStyle} of
+package \Package{scrlayer}. Thereby for a page style \PName{Name}
+the layer \PName{Name}\PValue{.head.above.line} will be defined for the
+horizontal line above the page head, the layer \PName{Name}\PValue{.head.odd}
+will be defined for the page head of odd pages in two-side layout,
+\PName{Name}\PValue{.head.even} will be defined for the page head of even
+pages in two-side layout, \PName{Name}\PValue{.head.oneside} will be defined
+for the page head of all pages in one-side layout,
+\PName{Name}\PValue{.head.below} will be defined for the horizontal line below
+the page head, \PName{Name}\PValue{.foot.above.line} will be defined for the
+horizontal line above the page foot, \PName{Name}\PValue{.foot.odd} will be
+defined for the page foot of odd pages in two-side layout,
+\PName{Name}\PValue{.foot.even} for the page foot of even pages in two-side
+layout, \PName{Name}\PValue{.foot.oneside} for the page foot of all pages in
+one-side layout, and last but not least \PName{Name}\PValue{.foot.below} for
+the horizontal line below the page foot. More information about layers and
+layer page styles can be found starting on \autopageref{cha:scrlayer} in
+\autoref{cha:scrlayer} of \autoref{part:forExperts}.%
%
\begin{Example}
- Assume you want to background the whole head of page style
- \Pagestyle{scrheadings} with a colour. Because you read the introduction to
+ Assume you want to colour the whole background of page style
+ \Pagestyle{scrheadings}' head. Because you read the introduction to
this chapter, you know, that \Pagestyle{scrheadings} last but not least is a
layer page style with, e.\,g., layers \PValue{scrheadings.head.even},
\PValue{scrheadings.head.odd}, and \PValue{scrheadings.head.oneside}. So you
@@ -615,18 +613,18 @@ page styles can be found from \autopageref{cha:scrlayer} in
layer using option \Option{clone}. This is much easier than using only one
background layer and dynamically calculate the position time by time.
- The coloured background have been printed using a \Macro{rule} command in
- this example. The size arguments of this \Macro{rule} are given by
+ In this example the coloured background is printed using a \Macro{rule}
+ command. The size arguments of this \Macro{rule} are given by
\Macro{layerwidth} and \Macro{layerheight} which contain the current width
- and height of the layer itself. The optional argument of \Macro{rule} has
- been used to move the rule down by the height of a descender.
+ and height of the layer itself. The optional argument of \Macro{rule} is
+ used to move the rule down by the height of a descender.
\end{Example}
%
-Instead of using new layers for the background colours like in the example
-above, \Macro{colorbox} and \Macro{chead} could have been used. It is
-recommended to build such a solution as an exercise. Another change could be
-to add the background layers one by one and just before the contents
-layers. You may do this as an exercise too.%
+Instead of using new layers to colour the background in the example above,
+\Macro{colorbox} and \Macro{chead} could have been used. It is recommended to
+build such a solution as an exercise. Another approach could be to add the
+background layers one by one and just before the contents layers. You may do
+this as an exercise too.%
\EndIndex{Cmd}{renewpagestyle}%
\EndIndex{Cmd}{providepagestyle}%
\EndIndex{Cmd}{newpagestyle}%
@@ -639,14 +637,14 @@ layers. You may do this as an exercise too.%
Package \Package{scrpage2} outputs page heads and page foots in horizontal
mode always. In opposite to this \Package{scrlayer-scrpage} does not switch
into horizontal mode itself, but the output of horizontal material will do
-so. Nevertheless, you can activate option \Option{hmode} to make
-\Package{scrlayer-scrpage} more compatible with \Package{scrpage2} in this
-aspect. But this would have implications to, i.\,e., white
+so. Nevertheless, you can activate option \Option{hmode} gain compatibility to
+\Package{scrpage2} in this
+aspect. But this would have side effects, i.\,e., white
spaces at the start of the output or the vertical alignment of the output.
-The options knows the standard values for simple switches that are given at
-\autoref{tab:truefalseswitch} on \autopageref{tab:truefalseswitch}. The option
-is deactivated by default.%
+The options allows for the standard values for simple switches that are given
+at \autoref{tab:truefalseswitch} on \autopageref{tab:truefalseswitch}. The
+option is deactivated by default.%
\EndIndex{Option}{hmode}%
%
\EndIndex{Package}{scrlayer-scrpage}%
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage.tex
index 34d3a727741..4cbc046c797 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrlayer-scrpage.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrlayer-scrpage.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -44,11 +44,11 @@
% ============================================================================
\KOMAProvidesFile{scrlayer-scrpage.tex}%
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-10-27 08:39:00 +0100 (Mon, 27 Oct 2014) $
KOMA-Script guide (chapter: scrlayer-scrpage)]
\translator{Markus Kohm\and Jana Schubert\and Jens H\"uhne}
-% Date version of the translated file: 2013-11-15
+% Date version of the translated file: 2014-10-27
\chapter[{Adapting Page Headers and Footers with \Package{scrlayer-scrpage}}]
{Adapting\ChangedAt{v3.12}{\Package{scrlayer-scrpage}} Page Headers and
@@ -116,8 +116,8 @@ insufficient for your purposes you are encouraged to examine
\section{Usage of Predefined Page Styles}
\label{sec:scrlayer-scrpage.predefined.pagestyles}
-The easiest way to get a requested design of page head and foot with
-\Package{scrlayer-scrpage} is the usage of a predefined page style.
+The easiest way to your desired design for page header and footer with
+\Package{scrlayer-scrpage} is to use one of the predefined page styles.
\begin{Declaration}
\Pagestyle{scrheadings}\\
@@ -125,41 +125,47 @@ The easiest way to get a requested design of page head and foot with
\end{Declaration}
\BeginIndex{Pagestyle}{scrheadings}%
\BeginIndex{Pagestyle}{plain.scrheadings}%
-Package \Package{scrlayer-scrpage} provides two page styles that may be
-reconfigured depending on your own requests. Let's first of all talk about
-page style \Pagestyle{scrheadings} which has been designed to be used with
+Package \Package{scrlayer-scrpage} provides two page styles, which may be
+reconfigured to meet your individual reqirements. Let's first of all discuss
+page style \Pagestyle{scrheadings} which has been designed as a style using
running heads. Its defaults are similar to the page style
-\Pagestyle{headings}\IndexPagestyle{headings} of \LaTeX's standard classes or
-the \KOMAScript{} classes. The commands and options that may be used to
-configure the exact contents of the header and footer will be described
-consecutively.
-
-Second there's page style \Pagestyle{plain.scrheadings} which has been
-designed to be used without any running head. Its defaults are very similar to
-page style \Pagestyle{plain}\IndexPagestyle{plain} of \LaTeX's standard
-classes or the \KOMAScript{} classes. Once more the commands and options that
-may be used to configure the exact contents of the header and footer will be
-described consecutively.
-
-Fore sure, you could configure \Pagestyle{scrheadings} to be a page style
+\Pagestyle{headings}\IndexPagestyle{headings} of the \LaTeX standard classes
+or the \KOMAScript{} classes. What exactly gets printed in the header or
+footer can be configured via the commands and otions described hereafter.
+
+The second page style to be mentioned here is \Pagestyle{plain.scrheadings},
+which has been designed to be a style with no running head. Its defaults are
+very similar to page style \Pagestyle{plain}\IndexPagestyle{plain} of \LaTeX's
+standard classes or the \KOMAScript{} classes. The following will describe the
+commands and options you may use to adjust the contents of the header and
+footer .
+
+You could of course configure \Pagestyle{scrheadings} to be a page style
without a running head and \Pagestyle{plain.scrheadings} to be a page style
-with running heads. Nevertheless, it is more useful to fit the conventions
-declared above, mainly, because both page styles influence each other. If you
-select one of these page styles, \Pagestyle{scrheadings} will become
-accessible as \Pagestyle{headings} and the page style
-\Pagestyle{plain.scrheadings} will become accessible as \Pagestyle{plain}. So,
-if you have a class or package that automatically switches between
-\Pagestyle{headings} and \Pagestyle{plain}, you need to select
-\Pagestyle{scrheadings} or \Pagestyle{plain.scrheadings} only once and then
-the class or package will switch between \Pagestyle{scrheadings} and
-\Pagestyle{plain.scrheadings} without even knowing these page styles. Patches
-or other adaptions of classes (or packages) will not be necessary. So these page
-styles are something like a pair that may be used as a drop-in replacement
-for \Pagestyle{headings} and \Pagestyle{plain}.
-
-At this point I'd like to mention that for compatibility with
-\Package{scrpage2} page style \Pagestyle{plain.scrheadings} can also be used
-with the alias name \Pagestyle{scrplain}\IndexPagestyle[indexmain]{scrplain}.
+using running heads. It is, however, far more expedient to adhere to the
+conventions mentioned above, if for the only reason that both page styles
+mutually influence one another. Once you have opted to apply one of these
+page styles, \Pagestyle{scrheadings} will become accessible as
+\Pagestyle{headings} and the page style \Pagestyle{plain.scrheadings} will
+become accessible as \Pagestyle{plain}. Thus, if you use a class or package
+that automatically switches between \Pagestyle{headings} and
+\Pagestyle{plain}, you only need to select \Pagestyle{scrheadings} or
+\Pagestyle{plain.scrheadings} once and the switching class or package will
+then switch between \Pagestyle{scrheadings} and \Pagestyle{plain.scrheadings}
+without even being aware of these page styles. Patches or other adaptions of
+classes (or packages) will not be necessary. This pair of page styles may thus
+serve as a drop-in replacement for \Pagestyle{headings} and \Pagestyle{plain}.
+Should additional similar pairs be required I'd like to point you to
+\autoref{sec:scrlayer-scrpage.pagestyle.pairs} in \autoref{part:forExperts}
+for further reference.
+
+For users of the older \Package{scrpage2}, I'd like to mention that, for
+compatibility with \Package{scrpage2}, page style
+\Pagestyle{plain.scrheadings} may also be used under its alias name of
+\Pagestyle{scrplain}\IndexPagestyle[indexmain]{scrplain}.%
+\iffree{}{ If you use \Package{scrpage2}\IndexPackage{scrpage2}, however,
+ \Pagestyle{plain.scrheadings} will not be available. Its function is
+ completely taken over by pagestyle \Pagestyle{scrplain}.}
%
\EndIndex{Pagestyle}{plain.scrheadings}%
\EndIndex{Pagestyle}{scrheadings}%
@@ -458,7 +464,7 @@ sketched in \autoref{fig:scrlayer-scrpage.head}.%
To see the difference you should also add an optional argument to
\Macro{lohead} and \Macro{rohead} containing some content. To do so, change
the example above:
- \begin{lstcode}
+\begin{lstcode}
\documentclass{scrartcl}
\usepackage{scrlayer-scrpage}
\lohead[John Doe]
@@ -494,6 +500,65 @@ section.%
\EndIndex{Cmd}{cehead}%
\EndIndex{Cmd}{lehead}%
+
+\begin{Declaration}
+ \Macro{lehead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{cehead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{rehead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{lohead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{cohead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{rohead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}
+\end{Declaration}
+\BeginIndex{Cmd}{lehead*}%
+\BeginIndex{Cmd}{cehead*}%
+\BeginIndex{Cmd}{rehead*}%
+\BeginIndex{Cmd}{lohead*}%
+\BeginIndex{Cmd}{cohead*}%
+\BeginIndex{Cmd}{rohead*}%
+The previously described commands have also a version with
+star\ChangedAt{v3.14}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}} that differs only if you omit the optional argument
+\PName{plain.scrheadings's content}. In this case the version without star
+does not change the content of \Pagestyle{plain.scrheadings}. The
+version with star on the other hand uses the obligatory argument
+\PName{scrheading's content} also as default for
+\Pagestyle{plain.scrheadings}. So, if both arguments should be the same, you
+can simply use the star version with the obligatory argument only.%
+
+\begin{Example}
+ You can shorten the previous example using the star version of
+ \Macro{lohead} and \Macro{rohead}:
+\begin{lstcode}
+ \documentclass{scrartcl}
+ \usepackage{scrlayer-scrpage}
+ \lohead*{John Doe}
+ \rohead*{Page style with \KOMAScript}
+ \pagestyle{scrheadings}
+ \begin{document}
+ \title{Page styles with \KOMAScript}
+ \author{John Doe}
+ \maketitle
+ \end{document}
+\end{lstcode}
+\end{Example}
+
+The obsolete package \Package{scrpage2}\important{\Package{scrpage2}} does not
+provide this feature.%
+%
+\EndIndex{Cmd}{rohead*}%
+\EndIndex{Cmd}{cohead*}%
+\EndIndex{Cmd}{lohead*}%
+\EndIndex{Cmd}{rehead*}%
+\EndIndex{Cmd}{cehead*}%
+\EndIndex{Cmd}{lehead*}%
+
+
\begin{Declaration}
\Macro{lefoot}\OParameter{plain.scrheadings's content}%
\Parameter{scrheadings's content}\\
@@ -767,6 +832,71 @@ ideally together with the automatism described in the following section.%
\EndIndex{Cmd}{cefoot}%
\EndIndex{Cmd}{lefoot}%
+
+\begin{Declaration}
+ \Macro{lefoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{cefoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{refoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{lofoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{cofoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{rofoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}
+\end{Declaration}
+\BeginIndex{Cmd}{lefoot*}%
+\BeginIndex{Cmd}{cefoot*}%
+\BeginIndex{Cmd}{refoot*}%
+\BeginIndex{Cmd}{lofoot*}%
+\BeginIndex{Cmd}{cofoot*}%
+\BeginIndex{Cmd}{rofoot*}%
+The previously described commands have also a version with
+star\ChangedAt{v3.14}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}} that differs only if you omit the optional argument
+\PName{plain.scrheadings's content}. In this case the version without star
+does not change the content of \Pagestyle{plain.scrheadings}. The
+version with star on the other hand uses the obligatory argument
+\PName{scrheading's content} also as default for
+\Pagestyle{plain.scrheadings}. So, if both arguments should be the same, you
+can simply use the star version with the obligatory argument only.
+
+\begin{Example}
+ You can shorten the previous example using the star version of
+ \Macro{lofoot} and \Macro{refoot}:
+\begin{lstcode}
+ \documentclass[twoside]{scrartcl}
+ \usepackage{scrlayer-scrpage}
+ \lohead{John Doe}
+ \rohead{Page style with \KOMAScript}
+ \lofoot*{Smart Alec Publishing}
+ \rehead{John Doe}
+ \lohead{Page style with \KOMAScript}
+ \refoot*{Smart Alec Publishing}
+ \pagestyle{scrheadings}
+ \usepackage{lipsum}
+ \begin{document}
+ \title{Page styles with \KOMAScript}
+ \author{John Doe}
+ \maketitle
+ \lipsum\lipsum
+ \end{document}
+\end{lstcode}
+\end{Example}
+
+The obsolete package \Package{scrpage2}\important{\Package{scrpage2}} does not
+provide this feature.%
+%
+\EndIndex{Cmd}{rofoot*}%
+\EndIndex{Cmd}{cofoot*}%
+\EndIndex{Cmd}{lofoot*}%
+\EndIndex{Cmd}{refoot*}%
+\EndIndex{Cmd}{cefoot*}%
+\EndIndex{Cmd}{lefoot*}%
+
+
\begin{Declaration}
\Macro{ohead}\OParameter{plain.scrheadings's content}%
\Parameter{scrheadings's content}\\
@@ -847,6 +977,66 @@ section.%
\EndIndex{Cmd}{cfoot}%
\EndIndex{Cmd}{ofoot}%
+\begin{Declaration}
+ \Macro{ohead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{chead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{ihead*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{ofoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{cfoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}\\
+ \Macro{ifoot*}\OParameter{plain.scrheadings's content}%
+ \Parameter{scrheadings's content}
+\end{Declaration}
+\BeginIndex{Cmd}{ohead*}%
+\BeginIndex{Cmd}{chead*}%
+\BeginIndex{Cmd}{ihead*}%
+\BeginIndex{Cmd}{ofoot*}%
+\BeginIndex{Cmd}{cfoot*}%
+\BeginIndex{Cmd}{ifoot*}%
+The previously described commands have also a version with
+star\ChangedAt{v3.14}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}} that differs only if you omit the optional argument
+\PName{plain.scrheadings's content}. In this case the version without star
+does not change the content of \Pagestyle{plain.scrheadings}. The
+version with star on the other hand uses the obligatory argument
+\PName{scrheading's content} also as default for
+\Pagestyle{plain.scrheadings}. So, if both arguments should be the same, you
+can simply use the star version with the obligatory argument only.%
+
+\begin{Example}
+ You can shorten the previous example using the star version of
+ \Macro{ifoot}:
+\begin{lstcode}
+ \documentclass[twoside]{scrartcl}
+ \usepackage{scrlayer-scrpage}
+ \ihead{John Doe}
+ \ohead{Page style with \KOMAScript}
+ \ifoot*{Smart Alec Publishing}
+ \pagestyle{scrheadings}
+ \usepackage{lipsum}
+ \begin{document}
+ \title{Page styles with \KOMAScript}
+ \author{John Doe}
+ \maketitle
+ \lipsum\lipsum
+ \end{document}
+\end{lstcode}
+\end{Example}
+
+The obsolete package \Package{scrpage2}\important{\Package{scrpage2}} does not
+provide this feature.%
+%
+\EndIndex{Cmd}{ihead*}%
+\EndIndex{Cmd}{chead*}%
+\EndIndex{Cmd}{ohead*}%
+\EndIndex{Cmd}{ifoot*}%
+\EndIndex{Cmd}{cfoot*}%
+\EndIndex{Cmd}{ofoot*}%
+
\begin{Declaration}
\KOption{pagestyleset}\PName{setting}
@@ -1048,7 +1238,7 @@ elements.%
\EndIndex{FontElement}{headtopline}%
\BeginIndex{Cmd}{setheadtopline}%
-\BeginIndex{Cmd}{setheadseoline}%
+\BeginIndex{Cmd}{setheadsepline}%
\BeginIndex{Cmd}{setfootsepline}%
\BeginIndex{Cmd}{setfootbotline}%
Package \Package{scrpage2} has additionally to the options that do not take
@@ -1066,7 +1256,7 @@ switch the lines on or off. They have been made to configure already switched
on lines. Users often ignored this!%
\EndIndex{Cmd}{setfootbotline}%
\EndIndex{Cmd}{setfootsepline}%
-\EndIndex{Cmd}{setheadseoline}%
+\EndIndex{Cmd}{setheadsepline}%
\EndIndex{Cmd}{setheadtopline}%
%
\EndIndex{Option}{footbotline~=\PName{thickness\textup{:}length}}%
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 2e413bf8d7d..5f6b18760ab 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,7 +46,7 @@
% ============================================================================
\KOMAProvidesFile{scrlayer.tex}
- [$Date: 2013-12-13 17:39:21 +0100 (Fr, 13 Dez 2013) $
+ [$Date: 2013-12-31 12:58:50 +0100 (Tue, 31 Dec 2013) $
KOMA-Script guide (chapter:scrlayer)]
\translator{Markus Kohm}
@@ -276,7 +276,7 @@ layers internally.
If you use \Macro{ProvideLayer} instead of \Macro{DeclareLayer}, the
declaration will be ignored in case a layer with the same layer name already
-exists. It could be paraphrased by: \emph{declare the layer only, if it has not
+exists. It could be paraphrased by: \emph{declare the layer only if it has not
been declared already.}
If an existing layer should be redefined, \Macro{RedeclareLayer} or
@@ -554,12 +554,12 @@ be removed.%
\Macro{layercontentsmeasure}%
\end{Declaration}
\BeginIndex{Cmd}{layercontentsmeasure}%
-The command \Macro{layercontentsmeasure} is internally used, if option
-\Option{draft} has been set, so visualise the layers. The visualisation will
-be done with a centimetre ruler at the top and left edge of the layer and an
-inch ruler at the bottom and right edge of the layer. The rulers will be drawn
-behind the content of the layer. If you would, you could also use it as
-exclusive content of a layer.%
+The command \Macro{layercontentsmeasure} prints a ruler at each layer edge, of
+which the top and left one is labelled with centimeters, the right and bottom
+one with inches. This command is used internally, if option
+\Option{draft}\IndexOption{draft} is enabled. The rulers will be drawn behind
+the content of each layer. It can also be used as exclusive content of a
+layer.%
\EndIndex{Cmd}{layercontentsmeasure}
@@ -578,47 +578,45 @@ The page head will be printed before the main contents of a page. The page
footer will be printed after the main contents of a page. So this is something
like the layer attributes \Option{background} and \Option{foreground}.
-So it's obvious to declare page styles to be a list of layers. But instead of
+So it suggests itself to declare page styles as a list of layers. But instead of
having only four attributes \Option{oddpage}, \Option{evenpage},
\Option{background}, and \Option{foreground} all the attributes of layers
shown in \autoref{sec:scrlayer.layers} may be used.
-The outcome of this is that layer page styles are one type of page styles
-\Package{scrlayer} provides. A layer page style consists of layers and
-several \emph{hooks}. For description of layers see
+The outcome of all such considerations is that layer page styles are one type
+of page styles \Package{scrlayer} provides. A layer page style consists of
+layers and several \emph{hooks}. For description of layers see
\autoref{sec:scrlayer.layers}. The \emph{hooks} are points in the expansion
-or execution of page styles and you may add additional code that will be
-expanded there. Advanced users know this already from commands like
-\Macro{AtBeginDocument} (see \cite{latex:usrguide}) or
-\Macro{BeforeClosingMainAux} (see
+or execution of page styles you may add additional code to. Advanced users
+know this already from commands like \Macro{AtBeginDocument} (see
+\cite{latex:usrguide}) or \Macro{BeforeClosingMainAux} (see
\autopageref{desc:scrlfile.cmd.BeforeClosingMainAux}).
-Alias page styles are another type of page styles, provided by
-\Package{scrlayer}. An alias page style simply consists of another page
-style. In other words, the name of an alias page style is an alias name of
-another page style, the aliased or original page style. Because of this, the
-manipulation of an alias page style results in the manipulation of the
-original page style. If the original page style is an alias page style too,
-the manipulation will result in the manipulation of the aliased page style of
-that original page style and so on until a real page style will be
-manipulated. You may not only alias layer page styles made with
-\Package{scrlayer}, but all kind of page styles.
+Alias page styles are another type of page styles provided by
+\Package{scrlayer}. An alias page style wraps another page style. In other
+words, the name of an alias page style is an alias name of another page style,
+the aliased or original page style. Because of this, the manipulation of an
+alias page style results in the manipulation of the original page style. If
+the original page style is an alias page style too, the manipulation will
+result in the manipulation of the aliased page style of that original page
+style and so on until a real page style will be manipulated. Aliasing is not
+restricted to \Package{scrlayer} page styles, but possible for all page
+styles.
\begin{Declaration}
\Macro{currentpagestyle}
\end{Declaration}
\BeginIndex{Cmd}{currentpagestyle}%
Package scrlayer patches \Macro{pagestyle} to set \Macro{currentpagestyle} to
-the currently active page style. Note, \Macro{thispagestyle} does not
-change \Macro{currentpagestyle}. But if you use \Macro{thispagestyle} the
-result of \Macro{currentpagestyle} may be changed while execution of the
-\LaTeX{} output routine. This may be relevant only, if
-\Macro{currentpagestyle} has been used protected until execution of the output
-routine.
+the currently active page style. Note, \Macro{thispagestyle} does not change
+\Macro{currentpagestyle}. But if you use \Macro{thispagestyle} the result of
+\Macro{currentpagestyle} may be changed while executing the \LaTeX{} output
+routine. However, this change will only occur, if \Macro{currentpagestyle} has
+been actively protected from expansion up to execution of the output routine.
Note, the layer page styles described later in this section, will not need
the patch of \Macro{pagestyle} to set \Macro{currentpagestyle}. The patch has
-been made for usage with other page styles. Note also,
+been made for usage with other page styles. Additionally,
\Macro{currentpagestyle} is empty before the first \Macro{pagestyle} after
loading \Package{scrlayer}. So if you define an end user page style interface,
it may be useful to use an implicit \Macro{pagestyle} to set the current page
@@ -638,10 +636,10 @@ of \Macro{pagestyle}.
The command \Macro{AfterSelectAnyPageStyle} is similar, but the \PName{code}
will be executed just after the page style has been selected and after
-\Macro{currentpagestyle} has been set to the name of real page style.
+\Macro{currentpagestyle} has been set to the name of the real page style.
Note\textnote{Attention!}, \PName{code} of both commands will be executed
-only, if a page style will be selected using \Macro{pagestyle}, but not,
+only if a page style will be selected using \Macro{pagestyle}, but not,
e.\,g., if a page style will be selected using \Macro{thispagestyle}. Note
also, you cannot remove \PName{code} from the hook after adding it. But
the \PName{code} will be added locally, so you may use a group to limit the
@@ -665,16 +663,16 @@ scope of \PName{code}.%^^A
\BeginIndex{Cmd}{RedeclarePageStyleAlias}%
These commands may be used to define a page style with name \PName{alias page
style name} that is simply an alias for an already existing page style with
-name \PName{original page style name}. If there's already a page style
-\PName{alias page style name} it will be destroyed before creating the alias
-using \Macro{DeclarePageStyleAlias} or \Macro{RedeclarePageStyleAlias}.
+name \PName{original page style name}. If there is already a page style
+\PName{alias page style name}, then using \Macro{DeclarePageStyleAlias} or
+\Macro{RedeclarePageStyleAlias} will destroy the alias before recreating it.
\Macro{DeclareNewPageStyleAlias} will throw an error message, if a page style
\PName{alias page style name} has already been defined before. It does not
matter if the already defined page style is a layer page style, an alias page
style or another page style.
-\Macro{ProvidePageStyleAlias} will define the alias only, if a page style
+\Macro{ProvidePageStyleAlias} will define the alias only if a page style
\PName{alias page style name} has not been defined before. If a page style
\PName{alias page style name} already exists nothing will be done.
@@ -692,13 +690,13 @@ exist, then you will get an error.%
\end{Declaration}
\BeginIndex{Cmd}{DestroyPageStyleAlias}%
This command makes the page style with given \PName{page style name}
-\LaTeX-undefined, if it is an alias for another page style. After this, the
+\LaTeX-undefined, if it is an alias for another page style. Afterwards, the
page style may be defined newly with, e.g., \Macro{DeclareNewAliasPageStyle}
or \Macro{ProvideAliasPageStyle}.
The command is intended to be used inside of
\Macro{scrlayerOnAutoRemoveInterface} to remove page styles that have been
-declared by an interface and uses removable macros of that interface.%
+declared by an interface and use removable macros of that interface.%
\EndIndex{Cmd}{DestroyPageStyleAlias}
\begin{Declaration}
@@ -732,15 +730,15 @@ style will consist of the layers given in \PName{layer list}, a comma
separated list of layer names. Note, the \PName{page style name} and the
layer names at the \PName{layer list} must be fully expandable and should
expand to letters. Several other characters are tolerated, but,
-nevertheless, are not recommended.
+nevertheless, not recommended.
The \PName{option list} is a comma separated list of
\OptionValue{\PName{key}}{\PName{value}} options. These options may be used to
set additional features. Currently they are used to set the code that should
be expanded or executed at several \emph{hooks}. See the introduction to this
section for more general information about \emph{hooks}. See
-\autoref{tab:scrlayer.pagestyle.hooks} for more information about the hooks
-and their purpose.
+\autoref{tab:scrlayer.pagestyle.hooks} for detailed information on specific
+hooks.
\begin{desclist}
\desccaption{%
@@ -750,68 +748,68 @@ and their purpose.
The \emph{hook} options for page styles (\emph{Continuation})%
}%
\entry{\KOption{onselect}\PName{code}}{%
- Execute \PName{code} whenever the page style will be selected using, e.g.,
+ Execute \PName{code} whenever the page style is selected using, e.g.,
\Macro{pagestyle}. Note\textnote{Attention!}, \Macro{thispagestyle}
does not select the page style immediately, but asynchronously inside
\LaTeX's output routine.%
}%
\entry{\KOption{oninit}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style
- will be initialised. Note\textnote{Attention!}, this will be done
+ Execute \PName{code} whenever the output of page style's layers
+ is initialised. Note\textnote{Attention!}, this is done
twice for every page: once for background layers and once for foreground
layers.%
}%
\entry{\KOption{ononeside}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style in
- single-side mode will initialised. Note\textnote{Attention!}, this
- will be done twice for every page: once for background layers and once for
+ Execute \PName{code} whenever the output of page style's layers in
+ single-side mode is initialised. Note\textnote{Attention!}, this
+ is done twice for every page: once for background layers and once for
foreground layers.%
}%
\entry{\KOption{ontwoside}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style in
- two-side mode will initialised. Note\textnote{Attention!}, this will
- be done twice for every page: once for background layers and once for
+ Execute \PName{code} whenever the output of page style's layers in
+ two-side mode is initialised. Note\textnote{Attention!}, this is
+ done twice for every page: once for background layers and once for
foreground layers.%
}%
\entry{\KOption{onoddpage}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style on
- an odd page will initialised. Note\textnote{Attention!}, this will be
+ Execute \PName{code} whenever the output of page style's layers on
+ an odd page is initialised. Note\textnote{Attention!}, this is
done twice for every page: once for background layers and once for
- foreground layers. Note\textnote{Attention!} also, in single-side
+ foreground layers. Note\textnote{Attention!} also that in single-side
mode all pages are odd pages, not only pages with odd page numbers.%
}%
\entry{\KOption{onevenpage}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style on
- an even page will initialised. Note\textnote{Attention!}, this will
- be done twice for every page: once for background layers and once for
- foreground layers. Note\textnote{Attention!} also, there are not even
+ Execute \PName{code} whenever the output of page style's layers on
+ an even page is initialised. Note\textnote{Attention!}, this is
+ done twice for every page: once for background layers and once for
+ foreground layers. Note\textnote{Attention!} also that there are not even
pages in single-side mode, but all pages are odd pages, not only pages
with odd page numbers.%
}%
\entry{\KOption{onfloatpage}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style on
- a float page will initialised. Note\textnote{Attention!}, this will
+ Execute \PName{code} whenever the output of page style's layers on
+ a float page are initialised. Note\textnote{Attention!}, this is
be done twice for every page: once for background layers and once for
- foreground layers. Note\textnote{Attention!} also, float pages are
+ foreground layers. Note\textnote{Attention!} also that float pages are
only those pages with p-placed floating objects.%
}%
\entry{\KOption{onnonfloatpage}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style on
- a non-float page will initialised. Note\textnote{Attention!}, this
- will be done twice for every page: once for background layers and once for
- foreground layers. Note\textnote{Attention!} also, non-float pages
+ Execute \PName{code} whenever the output of page style's layers on
+ a non-float page is initialised. Note\textnote{Attention!}, this
+ is done twice for every page: once for background layers and once for
+ foreground layers. Note\textnote{Attention!} also that non-float pages
are all pages that are not float-pages. Those pages may have t-placed,
h-placed, b-placed, or no floating objects.%
}%
\entry{\KOption{onbackground}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style in
- the background of a page will initialised. Note\textnote{Attention!},
- this will be done once for every page.%
+ Execute \PName{code} whenever the output of page style's layers in
+ the background of a page is initialised. Note\textnote{Attention!},
+ this is done once for every page.%
}%
\entry{\KOption{onforeground}\PName{code}}{%
- Execute \PName{code} whenever the output of the layers of a page style in
- the foreground of a page will initialised. Note\textnote{Attention!},
- this will be done once for every page.%
+ Execute \PName{code} whenever the output page style's layers in
+ the foreground of a page is initialised. Note\textnote{Attention!},
+ this is done once for every page.%
}%
\end{desclist}
@@ -827,12 +825,12 @@ The difference of \Macro{DeclarePageStyleByLayers} and
\Macro{ProvidePageStyleByLayers} is that \Macro{ProvidePageStyleByLayers}
will simply do nothing, if there's already a page style with name \PName{page
style name}. In difference to \Macro{DeclareNewPageStyleByLayers} it will not
-raise an error in this case.
+raise an error.
The difference of \Macro{DeclarePageStyleByLayers} and
\Macro{RedeclarePageStyleByLayers} is, that \Macro{RedeclarePageStyleByLayers}
-may be used only, if the real page style of \PName{page style name} already
-exists. Otherwise an error would occur.
+may be used only if the real page style of \PName{page style name} already
+exists. Otherwise an error occurs.
Please have also a look at the notes to following pseudo page style
\Pagestyle{@everystyle@}.%
@@ -847,15 +845,16 @@ Please have also a look at the notes to following pseudo page style
\end{Declaration}
\BeginIndex{Pagestyle}{@everysel@}%
\BeginIndex{Pagestyle}{empty}%
-There are two somehow special, default layer page styles. The first one is
-\Pagestyle{@everystyle@}. This page style should not be used normally, but the
-layers of this page style will be used by all the other layer page styles. So
-adding a layer to this page style would be similar to adding this layer to all
-other layer page styles even the empty one. There's one difference: Layer
-referencing commands of the page style interface like
+There are two default layer page styles that are somehow special. The first
+one is \Pagestyle{@everystyle@}. This page style should not be used like any
+other page style, but the layers of this page style will be used by all the
+other layer page styles. So adding a layer to this page style is similar to
+adding this layer to all other layer page styles even the empty one. There's
+one difference: Layer referencing commands of the page style interface like
\Macro{ForEachLayerOfPageStyle}, \Macro{AddLayerToPageStyleBeforeLayer}, or
-\Macro{AddLayerToPageStyleAfterLayer} ignore the layers of
-\Pagestyle{@everystyle@} if they are used for another layer page style.
+\Macro{AddLayerToPageStyleAfterLayer} process only the layers of the page
+style that has been referenced but not the layers implicated by
+\Pagestyle{@everystyle@}.
The other somehow special page style is \Pagestyle{empty}. Normally page style
\Pagestyle{empty} is defined by the \LaTeX{} kernel, to be a page style
@@ -891,10 +890,10 @@ style \Pagestyle{@everysel@}.%
\BeginIndex{Option}{onpsforeground~=\PName{code}}%
There's also a \KOMAScript{} option for each of those \texttt{hooks}. The
names of the \KOMAScript{} options are similar to the names of the page style
-options, but with ``\texttt{ps}'' inserted behind ``\texttt{on}''. The value of
-the \KOMAScript{} options are the initial defaults of the corresponding
-\texttt{hooks}. This default will be extended by every usage of the page style
-options at the \PName{option list}. You may remove the default, using
+options, but with ``\texttt{ps}'' inserted behind ``\texttt{on}''. The value
+of the \KOMAScript{} options are the initial defaults of the corresponding
+\texttt{hooks}. These defaults will be extended at every declaration of page
+style hook options via \PName{option list}. You may remove the default, using
\Macro{ModifyLayerPageStyleOptions} described later in this section.%
\EndIndex{Option}{onpsforeground~=\PName{code}}%
\EndIndex{Option}{onpsbackground~=\PName{code}}%
@@ -912,13 +911,13 @@ options at the \PName{option list}. You may remove the default, using
\Macro{ForEachLayerOfPageStyle}\Parameter{page style name}\Parameter{code}
\end{Declaration}
\BeginIndex{Cmd}{ForEachLayerOfPageStyle}%
-As long as \KOMAScript{} option \Option{deactivatepagestylelayers} has not been
-activated command \Macro{ForEachLayerOfPageStyle} can be used to process
-\PName{code} for every layer that is a member of the layers list of a page
-style with given \PName{page style name}. Inside of \PName{code} the place
-holder \PValue{\#1} may be used for the name of the current layer.
+As long as \KOMAScript{} option \Option{deactivatepagestylelayers} has not
+been activated command \Macro{ForEachLayerOfPageStyle} can be used to process
+\PName{code} for every member layer of \PName{page style name}'s layers
+list. Inside of \PName{code} the place holder \PValue{\#1} may be used to
+reference the name of the current layer.
\begin{Example}
- If you want to output the names of all layers of page style
+ If you want to print the names of all layers of page style
\PValue{scrheadings}, you may us:
\begin{lstcode}
\let\commaatlist\empty
@@ -954,7 +953,7 @@ page styles.%
\BeginIndex{Cmd}{AddLayersAtEndOfPageStyle}%
\BeginIndex{Cmd}{RemoveLayersFromPageStyle}%
You can use these commands to add layers to a layer page style or to remove
-layers from a layer page style. The page style will be referenced by it
+layers from a layer page style. The page style will be referenced by
\PName{page style name}. The layers are given by a comma separated
\PName{layer list}.
@@ -1094,7 +1093,7 @@ only test one layer but several layers at a given, comma separated
\PName{layer list}. \Macro{IfSomeLayerAtPageStyle} will execute the
\PName{then code} if \emph{at least one} of the layers at \PName{layer list}
is a member of the layer list of \PName{page style name}. In difference
-\Macro{IfLayersAtPageStyle} executes the \PName{then code} only, if \emph{all}
+\Macro{IfLayersAtPageStyle} executes the \PName{then code} only if \emph{all}
of the layers at \PName{layer list} are members of the layer list of
\PName{page style name}.%
\EndIndex{Cmd}{IfLayersAtPageStyle}%
@@ -1118,7 +1117,8 @@ style\,---\,this may be set using \Macro{thispagestyle}\,---\,is \PName{page
Note, the layers of the page style will not be destroyed
automatically. If you want to destroy the layers too, you may use
-\begin{lstcode}
+% Umbruchkorrektur
+\begin{lstcode}[belowskip=\dp\strutbox]
\ForEachLayerOfPageStyle{...}{\DestroyLayer{#1}}
\end{lstcode}
\emph{before} destroying the layer page style.
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlfile.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlfile.tex
index a01d445a1cf..c680b1ee92c 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlfile.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlfile.tex
@@ -46,7 +46,7 @@
% ============================================================================
\KOMAProvidesFile{scrlfile.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (chapter: scrlfile)]
\translator{Gernot Hassenpflug\and Markus Kohm}
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 9ed1ae7f361..9f8964702d5 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,13 +46,13 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2-experts.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $
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}
-% Date of the translated German file: 2013/10/04
+% Date of the translated German file: 2014/06/25
\chapter{Additional Information about the Letter Class
\Class{scrlttr2}}
@@ -1278,8 +1278,8 @@ argument, not fully expandable. Nevertheless, if used within
similar commands, you need not insert a \Macro{protect}\IndexCmd{protect}
before using them. Of course this is also true for
\Macro{markleft}\IndexCmd{markleft} if using package
-\Package{scrpage2}. However\textnote{Attention!}, these kinds of commands can
-not be used within commands like
+\Package{scrlayer-scrpage}. However\textnote{Attention!}, these kinds of
+commands can not be used within commands like
\Macro{MakeUppercase}\important{\Macro{MakeUppercase}}\IndexCmd{MakeUppercase}
which directly influence their argument. To avoid this problem you may use
commands like \Macro{MakeUppercase} as an optional argument to
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 ab944d13090..f6353972ce1 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
@@ -1,6 +1,6 @@
% ======================================================================
% scrlttr2.tex
-% Copyright (c) Markus Kohm, 2002-2013
+% Copyright (c) Markus Kohm, 2002-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrlttr2.tex
-% Copyright (c) Markus Kohm, 2002-2013
+% Copyright (c) Markus Kohm, 2002-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,13 +46,13 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2.tex}%
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-10-07 08:53:12 +0200 (Tue, 07 Oct 2014) $
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}
-% Date of translated german file: 2013/11/07
+% Date of translated german file: 2014/10/07
\chapter{The New Letter Class \Class{scrlttr2}}
\labelbase{scrlttr2}
@@ -2510,9 +2510,9 @@ and typing area. To achieve this \KOMAScript{} will pass option
option. In\important{\Pagestyle{plain}} opposite to \Option{headsepline}
option \Option{footsepline} does influence page style \PValue{plain} also,
because \PValue{plain} uses a page number at the foot. Package
-\Package{scrpage2}\IndexPackage{scrpage2}\important{\Package{scrpage2}} (see
-\autoref{cha:scrpage}) provides additional features for rules at head and foot
-and may be combined with \Class{scrlttr2}.%
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage}\important{\Package{scrlayer-scrpage}}
+(see \autoref{cha:scrlayer-scrpage}) provides additional features for rules at
+head and foot and may be combined with \Class{scrlttr2}.%
%
\EndIndex{Option}{headsepline~=\PName{simple switch}}%
\EndIndex{Option}{footsepline~=\PName{simple switch}}%
@@ -2522,16 +2522,17 @@ and may be combined with \Class{scrlttr2}.%
\KOption{pagenumber}\PName{position}
\end{Declaration}
\BeginIndex{Option}{pagenumber~=\PName{position}}%
-This option defines if and where a page number will be placed on
-consecutive pages. This option affects the page
+This option defines if and where a page number will be placed on consecutive
+pages. This option affects the page
styles\important[i]{\Pagestyle{headings}\\
\Pagestyle{myheadings}\\
\Pagestyle{plain}} \Pagestyle{headings}, \Pagestyle{myheadings}, and
\Pagestyle{plain}. It also affects the default page styles of the
-\Package{scrpage2}\important{\Package{scrpage2}} package, if set before
-loading the package (see \autoref{cha:scrpage}). It can take values only
-influencing horizontal, only vertical, or both positions. Available value are
-shown in \autoref{tab:scrlttr2.pagenumber}. Default is \PValue{botcenter}.
+\Package{scrlayer-scrpage}\important{\Package{scrlayer-scrpage}} package, if
+set before loading the package (see \autoref{cha:scrlayer-scrpage}). It can
+take values only influencing horizontal, only vertical, or both
+positions. Available value are shown in
+\autoref{tab:scrlttr2.pagenumber}. Default is \PValue{botcenter}.
\begin{table}
\caption[{available values of option \Option{pagenumber} with
@@ -2604,15 +2605,15 @@ page styles.
\Variable{nextfoot}\IndexVariable{nextfoot}. The author can also change
these marks manually after the \Macro{opening} command. To this end, the
commands \Macro{markboth} and \Macro{markright} are available as usual, and
- with the use of package \Package{scrpage2} also \Macro{markleft} (see
- \autoref{sec:scrpage.basics.mark}, \autopageref{desc:scrpage.cmd.automark})
- is available.
+ with the use of package \Package{scrlayer-scrpage} also \Macro{markleft}
+ (see \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{desc:scrlayer-scrpage.cmd.automark}) is available.
\item[\Pagestyle{myheadings}] is the page style for manual page headings on
consecutive pages. This is very similar to \PValue{headings}, but
here the marks must be set by the author using the commands
\Macro{markboth}\IndexCmd{markboth} and
\Macro{markright}\Index{markright}. With the use of package
- \Package{scrpage2} also \Macro{markleft} can be utilized.
+ \Package{scrlayer-scrpage} also \Macro{markleft} can be utilized.
\item[\Pagestyle{plain}] is the page style with only page numbers in the
header or footer on consecutive pages. The placement of these page numbers is
influenced by the previously described option \Option{pagenumber}.
@@ -2641,9 +2642,10 @@ additional element \FontElement{pagefoot}\important{\FontElement{pagefoot}}
for the page foot. This will be used after \FontElement{pageheadfoot} at page
foots, that has been defined either with variable
\Variable{nextfoot}\IndexVariable{nextfoot} or Package
-\Package{scrpage2}\IndexPackage{scrpage2} (see \autoref{cha:scrpage},
-\autopageref{desc:scrpage.fontelement.pagefoot}). The element for the page
-number within the header or footer is named
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage} (see
+\autoref{cha:scrlayer-scrpage},
+\autopageref{desc:scrlayer-scrpage.fontelement.pagefoot}). The element for the
+page number within the header or footer is named
\FontElement{pagenumber}\important{\FontElement{pagenumber}}. Default settings
are listed in \autoref{tab:maincls.defaultFontsHeadFoot},
\autopageref{tab:maincls.defaultFontsHeadFoot}. Please have also a look at
@@ -2678,8 +2680,8 @@ the letterhead. The commands \Macro{markboth}\IndexCmd{markboth} and
\Macro{markright}\IndexCmd{markright} can in particular be used together with
pagestyle \PValue{myheadings}\IndexPagestyle{myheadings}%
\important{\Pagestyle{myheadings}}. If the package
-\Package{scrpage2}\IndexPackage{scrpage2} is used then this, of course, is
-valid also for pagestyle
+\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage} is used then this,
+of course, is valid also for pagestyle
\PValue{scrheadings}\IndexPagestyle{scrheadings}. There the command
\Macro{markleft}\IndexCmd{markleft} is furthermore available.
@@ -2729,8 +2731,6 @@ those.%
\LoadCommon[scrlttr]{8} % \section{Interleaf Pages}
\LoadCommon[scrlttr]{9} % \section{Footnotes}
-\LoadCommon[scrlttr]{11}% -"-
-\LoadCommon[scrlttr]{10}% -"-
\LoadCommon[scrlttr]{12}% \section{Lists}
@@ -2904,18 +2904,24 @@ particular complex examples of \File{lco}-files are shown at \cite{homepage}
or in \cite{DANTE:TK0203:MJK}. Both locations are mainly in German.
\begin{Declaration}
- \Macro{LoadLetterOption}\Parameter{name}
+ \Macro{LoadLetterOption}\Parameter{name}\\
+ \Macro{LoadLetterOptions}\Parameter{list of names}
\end{Declaration}
\BeginIndex{Cmd}{LoadLetterOption}%
-Usually, the \File{lco}-files will be loaded by the \Macro{documentclass}
-command. You enter the name of the \File{lco}-file without suffix as an
-option\Index{option}. The \File{lco}-file will be loaded right after the class
-file.
-
-However, it is also possible to load an \File{lco}-file later, or even from
-within another \File{lco}-file. This may be done with the
-\Macro{LoadLetterOption} command, which takes the \PName{name} of the
-\File{lco}-file without suffix as a parameter.
+\BeginIndex{Cmd}{LoadLetterOptions}%
+With \Class{scrlttr2} \File{lco}-files can be loaded by the
+\Macro{documentclass} command. You enter the name of the \File{lco}-file
+without suffix as an option\Index{option}. In this case, the \File{lco}-file
+will be loaded right after the class file.
+
+However, it is recommended to load an \File{lco}-file using
+\Macro{LoadLetterOption} or
+\Macro{LoadLetterOptions}\ChangedAt{v3.14}{\Class{scrlttr2}}. You can do this
+even from within another \File{lco}-file. Both commands take the \PName{name}
+of the \File{lco}-file without suffix, \Macro{LoadLetterOption} as a single
+parameter, \Macro{LoadLetterOptions} as one member of a comma-separated
+\PName{list of names}. The corresponding \File{lco}-files will be loaded in
+the order given by the list.
\begin{Example}
Mr Public also writes a document containing several letters. Most of them
should comply with the German DIN standard. So he starts with:
@@ -3096,6 +3102,7 @@ and \Package{keyval} packages.%
size warning}%
\end{desclist}
%
+\EndIndex{Cmd}{LoadLetterOptions}%
\EndIndex{Cmd}{LoadLetterOption}%
%
\EndIndex{}{lco-file=\File{lco}-file}%
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx
index a476e7722f0..acfbde56775 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx
@@ -2,7 +2,7 @@
% \iffalse
% ======================================================================
% scrlttr2examples.dtx
-% Copyright (c) Markus Kohm, 2008-2011
+% Copyright (c) Markus Kohm, 2008-2013
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrlttr2examples.dtx
-% Copyright (c) Markus Kohm, 2008-2011
+% Copyright (c) Markus Kohm, 2008-2013
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -328,7 +328,7 @@ Angriff zu nehmen.
72 72 neg rlineto
stroke
0 0 moveto
-/Charter findfont
+/Bitstream-Charter findfont
72 scalefont
setfont
(M) show
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrpage2.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrpage2.tex
deleted file mode 100644
index 937acdec0b0..00000000000
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrpage2.tex
+++ /dev/null
@@ -1,1499 +0,0 @@
-% ======================================================================
-% scrpage2.tex
-% Copyright (c) Markus Kohm, 2001-2013
-%
-% This file is part of the LaTeX2e KOMA-Script bundle.
-%
-% This work may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3c of the license.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later and of this work.
-%
-% This work has the LPPL maintenance status "author-maintained".
-%
-% The Current Maintainer and author of this work is Markus Kohm.
-%
-% This work consists of all files listed in manifest.txt.
-% ----------------------------------------------------------------------
-% scrpage2.tex
-% Copyright (c) Markus Kohm, 2001-2013
-%
-% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
-% Version 1.3c, verteilt und/oder veraendert werden.
-% Die neuste Version dieser Lizenz ist
-% http://www.latex-project.org/lppl.txt
-% und Version 1.3c ist Teil aller Verteilungen von LaTeX
-% Version 2005/12/01 oder spaeter und dieses Werks.
-%
-% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
-% (allein durch den Autor verwaltet).
-%
-% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm.
-%
-% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
-% ======================================================================
-%
-% Chapter about scrpage2 of the KOMA-Script guide
-% Maintained by Jens-Uwe Morawski (and sometimes Markus Kohm)
-%
-% ----------------------------------------------------------------------
-%
-% Kapitel ueber scrpage2 in der KOMA-Script-Anleitung
-% Verwaltet von Jens-Uwe Morawski (unterstuetzt von Markus Kohm)
-%
-% ============================================================================
-
-\KOMAProvidesFile{scrpage2.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
- KOMA-Script guide (chapter:scrpage2)]
-
-\translator{Jens-Uwe Morawski\and Karl-Heinz Zimmer\and Christoph Bier\and
- Gernot Hassenpflug\and Markus Kohm}
-
-% date of translated german file: 2013/07/22
-
-\chapter{Adapting Page Headers and Footers with \Package{scrpage2}}
-\labelbase{scrpage}
-
-%
-\BeginIndex{Package}{scrpage2}%
-As already mentioned in the two previous chapters, {\KOMAScript} includes a
-package to customise the document page header and footer. As of 2001, this
-package is no longer \Package{scrpage}\IndexPackage{scrpage} but the much
-improved and enhanced successor \Package{scrpage2}. Therefore, this
-documentation describes only \Package{scrpage2}. The package
-\Package{scrpage} is deprecated.
-
-\begin{Explain}
- In place of \Package{scrpage2} you can of course make use of
- \Package{fancyhdr} (see \cite{package:fancyhdr}). However,
- \Package{scrpage2} integrated markedly better with the {\KOMAScript}
- bundle. For this reason, and because at the time the forerunner to
- \Package{fancyhdr} was missing many features, \Package{scrpage2} was
- developed. Naturally, \Package{scrpage2} is not limited to use only
- with the {\KOMAScript} classes, but can just as easily be used with
- other document classes.
-\end{Explain}
-
-
-\section{Basic Functionality}\label{sec:scrpage.basics}
-
-\begin{Explain}% Introduction to headings
- To understand the following description, an overview of {\LaTeX}'s fairly
- involved header and footer mechanism is needed. The {\LaTeX} kernel defines
- the page styles \Pagestyle{empty}, which produces a completely empty header
- and footer, and \Pagestyle{plain}, which produces usually only a page number
- in the footer and an empty header. Apart from these, many document classes
- provide the style \Pagestyle{headings}, which allows more complex style
- settings and running
- headings\Index{headings>running}\Index{headings>automatic}. The
- \Pagestyle{headings} style often has a related variant,
- \Pagestyle{myheadings}, which is similar except for switching off the
- running headings\Index{headings>manual} and reverting them to manual control
- by the user. A more detailed description is given in
- \autoref{sec:maincls.pagestyle} where it is also noted that some {\LaTeX}
- commands automatically switch to another page style\,---\,usually page style
- \Pagestyle{plain}\,---\,for the current page.
-\end{Explain}
-
-
-Package \Package{scrpage2} does not distinguish between page styles with
-automatic, running headings and page styles with manual headings. The way to
-deal with automatic and manual headings is independent from the page style and
-so the page style is independent from the choice of automatic or manual
-headings. More information about this in \autoref{sec:scrpage.basics.mark}.
-
-
-\subsection{Predefined Page Styles}\label{sec:scrpage.basics.buildIn}
-
-One of the basic features of \Package{scrpage2} is a set of predefined,
-configurable page styles.
-
-% \lehead ...
-% scrheadings
-% \headmark \pagemark
-
-\begin{Declaration}
- \Pagestyle{scrheadings}\\
- \Pagestyle{scrplain}
-\end{Declaration}%
-\BeginIndex{Pagestyle}{scrheadings}%
-\BeginIndex{Pagestyle}{scrplain}%
-\Index{page>style}%
-%
-Package \Package{scrpage2} delivers its own page style, named
-\Pagestyle{scrheadings}, which can be activated with the
-\Macro{pagestyle}\PParameter{scrheadings}. When this page style is in use, an
-appropriate \Pagestyle{scrplain} page style is used for the plain page style.
-In this case \emph{appropriate} means that this new plain page style is also
-configureable by the commands introduced in
-\autoref{sec:scrpage.basics.format}, which, for example, configure the header
-and footer width and complies within the basic layout. Neither the activation
-of \Pagestyle{scrheadings} nor the attendant change to the appropriate plain
-page style, \Pagestyle{scrplain}, influences the mode of manual or automatic
-headings\Index{headings>automatic}\Index{headings>manual} (see
-\autoref{sec:scrpage.basics.mark}). The \Pagestyle{scrplain} page style can
-also be activated directly with \Macro{pagestyle}.
-
-\begin{Declaration}
- \Macro{lehead}%
- \OParameter{scrplain-left-even}\Parameter{scrheadings-left-even}\\
- \Macro{cehead}%
- \OParameter{scrplain-center-even}\Parameter{scrheadings-center-even}\\
- \Macro{rehead}%
- \OParameter{scrplain-right-even}\Parameter{scrheadings-right-even}\\
- \Macro{lefoot}%
- \OParameter{scrplain-left-even}\Parameter{scrheadings-left-even}\\
- \Macro{cefoot}%
- \OParameter{scrplain-center-even}\Parameter{scrheadings-center-even}\\
- \Macro{refoot}%
- \OParameter{scrplain-right-even}\Parameter{scrheadings-right-even}\\
- \Macro{lohead}%
- \OParameter{scrplain-left-odd}\Parameter{scrheadings-left-odd}\\
- \Macro{cohead}%
- \OParameter{scrplain-center-odd}\Parameter{scrheadings-center-odd}\\
- \Macro{rohead}%
- \OParameter{scrplain-right-odd}\Parameter{scrheadings-right-odd}\\
- \Macro{lofoot}%
- \OParameter{scrplain-left-odd}\Parameter{scrheadings-left-odd}\\
- \Macro{cofoot}%
- \OParameter{scrplain-center-odd}\Parameter{scrheadings-center-odd}\\
- \Macro{rofoot}%
- \OParameter{scrplain-right-odd}\Parameter{scrheadings-right-odd}\\
- \Macro{ihead}%
- \OParameter{scrplain-inside}\Parameter{scrheadings-inside}\\
- \Macro{chead}%
- \OParameter{scrplain-centered}\Parameter{scrheadings-centered}\\
- \Macro{ohead}%
- \OParameter{scrplain-outside}\Parameter{scrheadings-outside}\\
- \Macro{ifoot}%
- \OParameter{scrplain-inside}\Parameter{scrheadings-inside}\\
- \Macro{cfoot}%
- \OParameter{scrplain-centered}\Parameter{scrheadings-centered}\\
- \Macro{ofoot}%
- \OParameter{scrplain-outside}\Parameter{scrheadings-outside}
-\end{Declaration}%
-\BeginIndex{Cmd}{lehead}%
-\BeginIndex{Cmd}{cehead}%
-\BeginIndex{Cmd}{rehead}%
-\BeginIndex{Cmd}{ihead}%
-\BeginIndex{Cmd}{chead}%
-\BeginIndex{Cmd}{ohead}%
-\BeginIndex{Cmd}{lohead}%
-\BeginIndex{Cmd}{cohead}%
-\BeginIndex{Cmd}{rohead}%
-\BeginIndex{Cmd}{lefoot}%
-\BeginIndex{Cmd}{cefoot}%
-\BeginIndex{Cmd}{refoot}%
-\BeginIndex{Cmd}{ifoot}%
-\BeginIndex{Cmd}{cfoot}%
-\BeginIndex{Cmd}{rfoot}%
-\BeginIndex{Cmd}{lofoot}%
-\BeginIndex{Cmd}{cofoot}%
-\BeginIndex{Cmd}{rofoot}%
-The page style of \Package{scrpage2} are defined to have flexible configurable
-header and footer. To achieve this, the page styles include three boxes in
-both the header and the footer. The contents of these boxes may be modified
-easily. The commands modifying the content of these boxes can be seen in
-\autoref{fig:scrpage.leheadetall}. Commands in the middle column modify the
-box contents on both odd and even pages. All of the commands have an optional
-and a mandatory argument. The option Argument influences the content of
-corresponding box of the plain page style, \Pagestyle{scrplain}. The mandatory
-argument influences the content of the corresponding box of the page style
-\Pagestyle{scrheadings}.
-
-\begin{figure}
-% \centering
- \setcapindent{0pt}%
- \begin{captionbeside}
- [Commands for modification of \Package{scrpage2} page styles elements]%
- {Commands for modification of page styles \Pagestyle{scrheadings} and
- \Pagestyle{scrplain} and their relationship to header and footer
- elements}
- [l]
- \setlength{\unitlength}{.95mm}\begin{picture}(100,65)(0,8)\small
- \put(0,12){\dashbox{2}(40,56){even page}}
- \put(60,12){\dashbox{2}(40,56){odd page}}
- % items top left
- \put(1,63){\framebox(8,4){~}}
- \put(16,63){\framebox(8,4){~}}
- \put(31,63){\framebox(8,4){~}}
- % items top right
- \put(61,63){\framebox(8,4){~}}
- \put(76,63){\framebox(8,4){~}}
- \put(91,63){\framebox(8,4){~}}
- % items bottom left
- \put(1,13){\framebox(8,4){~}}
- \put(16,13){\framebox(8,4){~}}
- \put(31,13){\framebox(8,4){~}}
- % items bottom right
- \put(61,13){\framebox(8,4){~}}
- \put(76,13){\framebox(8,4){~}}
- \put(91,13){\framebox(8,4){~}}
- % commands and arrow
- % for twoside
- %
- \put(50,65){\makebox(0,0){\Macro{ihead}}}
- \put(44,65){\vector(-1,0){4}}\put(56,65){\vector(1,0){4}}
- \put(50,58){\makebox(0,0){\Macro{chead}}}
- \put(44,58){\line(-1,0){24}}\put(56,58){\line(1,0){24}}
- \put(20,58){\vector(0,1){4}}\put(80,58){\vector(0,1){4}}
- \put(50,51){\makebox(0,0){\Macro{ohead}}}
- \put(44,51){\line(-1,0){40}}\put(56,51){\line(1,0){40}}
- \put(4,51){\vector(0,1){11}}\put(96,51){\vector(0,1){11}}
- %
- \put(50,15){\makebox(0,0){\Macro{ifoot}}}
- \put(56,15){\vector(1,0){4}}\put(44,15){\vector(-1,0){4}}
- \put(50,22){\makebox(0,0){\Macro{cfoot}}}
- \put(44,22){\line(-1,0){24}}\put(56,22){\line(1,0){24}}
- \put(20,22){\vector(0,-1){4}}\put(80,22){\vector(0,-1){4}}
- \put(50,29){\makebox(0,0){\Macro{ofoot}}}
- \put(44,29){\line(-1,0){40}}\put(56,29){\line(1,0){40}}
- \put(4,29){\vector(0,-1){11}}\put(96,29){\vector(0,-1){11}}
- % commands for oneside
- \put(5,69){\makebox(0,0)[b]{\Macro{lehead}}}
- \put(20,69){\makebox(0,0)[b]{\Macro{cehead}}}
- \put(35,69){\makebox(0,0)[b]{\Macro{rehead}}}
- %
- \put(65,69){\makebox(0,0)[b]{\Macro{lohead}}}
- \put(80,69){\makebox(0,0)[b]{\Macro{cohead}}}
- \put(95,69){\makebox(0,0)[b]{\Macro{rohead}}}
- %
- \put(5,11){\makebox(0,0)[t]{\Macro{lefoot}}}
- \put(20,11){\makebox(0,0)[t]{\Macro{cefoot}}}
- \put(35,11){\makebox(0,0)[t]{\Macro{refoot}}}
- %
- \put(65,11){\makebox(0,0)[t]{\Macro{lofoot}}}
- \put(80,11){\makebox(0,0)[t]{\Macro{cofoot}}}
- \put(95,11){\makebox(0,0)[t]{\Macro{rofoot}}}
- \end{picture}
- \end{captionbeside}
-% \caption[Commands for modification of \Package{scrpage2} page styles
-% elements]%
-% {Commands for modification of page styles \Pagestyle{scrheadings} and
-% \Pagestyle{scrplain} and their relationship to header and footer
-% elements}
- \label{fig:scrpage.leheadetall}
-\end{figure}
-
-\begin{Example}
- If one wants the page number within \Pagestyle{scrheadings} be placed in the
- middle of the footer, then following can be used:
-\begin{lstcode}
- \cfoot{\pagemark}
-\end{lstcode}
- The next example shows how to place both running heading and page
- number\Index{page>number}\Index{pagination} in the header; the running
- heading\Index{headings} inside and the page number outside:
-\begin{lstcode}
- \ohead{\pagemark}
- \ihead{\headmark}
- \cfoot{}
-\end{lstcode}
- The command \Macro{cfoot}\PParameter{} is only required in order to
- empty the item in the middle of the footer, which normally contains
- the page number.
-\end{Example}
-
-The commands which are associated with only one item can be used for
-more advanced settings.
-
-\begin{Example}
- Assuming one has the order to write an annual report of a company, one could
- use commands like this:
-\begin{lstcode}
- \ohead{\pagemark}
- \rehead{Annual Report 2001}
- \lohead{\headmark}
- \cefoot{TheCompanyName Inc.}
- \cofoot{Department: Development}
-\end{lstcode}
- In order to keep the data in the footer synchronized with the content
- of the document, the footer has to be updated using \Macro{cofoot}
- when a new department is discussed in the report.
-\end{Example}
-
-As mentioned above, there is a new plain page style which corresponds to
-\Pagestyle{scrheadings}. Since it should also be possible to customize this
-style, the commands support an optional argument with which the contents of
-the appropriate fields of this plain page style can be modified.
-
-\begin{Example}
- The position of the page number for the page style \Pagestyle{scrheadings}
- can be declared as follows:
-\begin{lstcode}
- \cfoot[\pagemark]{}
- \ohead[]{\pagemark}
-\end{lstcode}
- When the command \Macro{chapter}, after it has started a new page, now
- switches to the page style \Pagestyle{plain}, then the page number is
- centered in the footer.
-\end{Example}
-%
-\EndIndex{Pagestyle}{scrheadings}%
-\EndIndex{Pagestyle}{scrplain}%
-
-
-\begin{Declaration}
- \Macro{clearscrheadings}\\
- \Macro{clearscrplain}\\
- \Macro{clearscrheadfoot}
-\end{Declaration}%
-\BeginIndex{Cmd}{clearscrheadings}%
-\BeginIndex{Cmd}{clearscrplain}%
-\BeginIndex{Cmd}{clearscrheadfoot}%
-If one wants to redefine both the page style \Pagestyle{scrheadings} and
-the corresponding plain page style, frequently one must empty
-some already occupied page elements. Since one rarely fills all items
-with new content, in most cases several instructions with empty
-parameters are necessary. With the help of these three instructions
-the quick and thorough deletion is possible. While
-\Macro{clearscrheadings} only deletes all fields of the page style
-\Pagestyle{scrheadings}, and \Macro{clearscrplain} deletes all fields of
-the corresponding plain page style, \Macro{clearscrheadfoot}
-sets all fields of both page styles to empty.
-\begin{Example}
- If one wants to reset the page style to the default {\KOMAScript}
- settings, independent of the actual configuration, only these three
- commands are sufficient:
-\begin{lstcode}
- \clearscrheadfoot
- \ohead{\headmark}
- \ofoot[\pagemark]{\pagemark}
-\end{lstcode}
- Without the commands \Macro{clearscrheadfoot},
- \Macro{clearscrheadings} and \Macro{clearscrplain}, six commands with
- additional nine empty arguments would be required:
-\begin{lstcode}
- \ihead[]{}
- \chead[]{}
- \ohead[]{\headmark}
- \ifoot[]{}
- \cfoot[]{}
- \ofoot[\pagemark]{\pagemark}
-\end{lstcode}
- Of course, for a specific configuration, some of them could be
- dropped.%
-\end{Example}%
-%
-\EndIndex{Cmd}{clearscrheadings}%
-\EndIndex{Cmd}{clearscrplain}%
-\EndIndex{Cmd}{clearscrheadfoot}%
-%
-\EndIndex{Cmd}{lehead}\EndIndex{Cmd}{cehead}\EndIndex{Cmd}{rehead}%
-\EndIndex{Cmd}{ihead}\EndIndex{Cmd}{chead}\EndIndex{Cmd}{ohead}%
-\EndIndex{Cmd}{lohead}\EndIndex{Cmd}{cohead}\EndIndex{Cmd}{rohead}%
-\EndIndex{Cmd}{lefoot}\EndIndex{Cmd}{cefoot}\EndIndex{Cmd}{refoot}%
-\EndIndex{Cmd}{ifoot}\EndIndex{Cmd}{cfoot}\EndIndex{Cmd}{rfoot}%
-\EndIndex{Cmd}{lofoot}\EndIndex{Cmd}{cofoot}\EndIndex{Cmd}{rofoot}%
-
-In the previous examples two commands were used which have not been
-introduced yet. The description of these commands follows.
-
-\begin{Declaration}
- \Macro{leftmark}\\
- \Macro{rightmark}
-\end{Declaration}%
-\BeginIndex{Cmd}{leftmark}%
-\BeginIndex{Cmd}{rightmark}%
-These two instructions make it possible to access the running headings, which
-are normally meant for the left or for the right page. These two instruction
-are not made available by \Package{scrpage2}, but directly by the {\LaTeX}
-kernel. When in this section running headings of the left page or the right
-page are mentioned, this refers to the contents of \Macro{leftmark} or
-\Macro{rightmark}, respectively.
-%
-\EndIndex{Cmd}{leftmark}%
-\EndIndex{Cmd}{rightmark}%
-
-
-\begin{Declaration}
- \Macro{headmark}
-\end{Declaration}%
-\BeginIndex{Cmd}{headmark}%
-This command gives access to the content of running headings. In
-contrast to \Macro{leftmark} and \Macro{rightmark}, one need not
-regard the proper assignment to left or right page.%
-%
-\EndIndex{Cmd}{headmark}
-
-
-\begin{Declaration}
- \Macro{pagemark}
-\end{Declaration}%
-\BeginIndex{Cmd}{pagemark}%
-This command returns the formatted page number. The formatting can be
-controlled by \Macro{pnumfont}, introduced in
-\autoref{sec:scrpage.basics.format}, \autopageref{desc:scrpage.cmd.pnumfont},
-which \Macro{pagemark} heeds automatically.%
-%
-\EndIndex{Cmd}{pagemark}
-
-
-\begin{Declaration}
- \Pagestyle{useheadings}
-\end{Declaration}%
-\BeginIndex{Pagestyle}{useheadings}
-The package \Package{scrpage2} is meant primarily for use of the supplied
-styles or for defining one's own styles. However, it may be necessary to shift
-back also to a style provided by the document class. It might appear that
-this should be done with
-\Macro{pagestyle}\PParameter{headings}\IndexCmd{pagestyle}, but this has the
-disadvantage that commands \Macro{automark} and \Macro{manualmark}, to be
-discussed shortly, do not function as expected. For this reason one should
-shift back to the original styles using
-\Macro{pagestyle}\PParameter{useheadings}\IndexCmd{pagestyle}, which chooses
-the correct page styles automatically for both manual and automatic running
-headings.%
-%
-\EndIndex{Pagestyle}{useheadings}
-
-
-\subsection{Manual and Running Headings}
-\label{sec:scrpage.basics.mark}
-% \automark \manualmark
-%
-\BeginIndex{}{headings>running}%
-\BeginIndex{}{headings>automatic}%
-\BeginIndex{}{headings>manual}%
-Usually there is a \emph{my}-version of the \Pagestyle{headings}
-page style. If such a page style is active, then the running headings
-are no longer updated no longer automatically and become manual
-headings. With \Package{scrpage2} a different path is taken. Whether
-the headings are running or manual is determined by the instructions
-\Macro{automark} and \Macro{manualmark}, respectively. The default
-can be set already while loading of the package, with the options
-\Option{automark} and \Option{manualmark} (see
-\autoref{sec:scrpage.basics.options},
-\autopageref{desc:scrpage.option.automark}).
-
-
-\begin{Declaration}
- \Macro{manualmark}
-\end{Declaration}%
-\BeginIndex{Cmd}{manualmark}%
-As the name suggests, \Macro{manualmark} switches off the updating of
-the running headings and makes them manual. It is left to the user to
-update and provide contents for the headings. For that purpose the
-instructions \Macro{markboth}\IndexCmd{markboth} and
-\Macro{markright}\IndexCmd{markright} are available.%
-%
-\EndIndex{Cmd}{manualmark}
-
-
-\begin{Declaration}
- \Macro{automark}\OParameter{right page}\Parameter{left page}
-\end{Declaration}%
-\BeginIndex{Cmd}{automark}%
-The macro \Macro{automark} activates the automatic updating, that is, running
-headings. For the two parameters the designations of the document sectioning
-level whose title is to appear in appropriate place are to be used. Valid
-values for the parameters are:
-\PValue{part}\ChangedAt{v2.2}{\Package{scrpage2}}, \PValue{chapter},
-\PValue{section}, \PValue{subsection}, \PValue{subsubsection},
-\PValue{paragraph}, and \PValue{subparagraph}. For most of the classes use of
-\PValue{part} will not produce the expected result. So far only {\KOMAScript}
-classes from version~2.9s up are known to support this value. The optional
-argument \PName{right page} is understandably meant only for double-sided
-documents. In the single-sided case one should normally not use it. With the
-help of the option
-\Option{autooneside}\IndexOption{autooneside}\important{\Option{autooneside}}
-one can also set that the optional argument in single-sided mode is ignored
-automatically (see \autoref{sec:scrpage.basics.options},
-\autopageref{desc:scrpage.option.autooneside}).
-%
-\begin{Example}
- Assuming that the document uses a \emph{book} class, whose topmost
- section level is \emph{chapter}, then after a preceding
- \Macro{manualmark}
-\begin{lstcode}
- \automark[section]{chapter}
-\end{lstcode}
- restores the original behaviour. If one prefers lower section levels
- in running headings, the following can be used:
-\begin{lstcode}
- \automark[subsection]{section}
-\end{lstcode}
-% How useful the last declaration is, everybody has to decide
-% for themselves.
-\end{Example}
-
-\begin{Explain}
- For the upper section level, the data of the headings is set by the command
- \Macro{markboth}\IndexCmd{markboth} (see \autoref{sec:maincls.pagestyle},
- \autopageref{desc:maincls.cmd.markboth}), while that for the lower section
- level by \Macro{markright}\IndexCmd{markright} or
- \Macro{markleft}\IndexCmd{markleft}. These commands are called indirectly
- by the sectioning commands. The macro \Macro{markleft} is provided by the
- package \Package{scrpage2} and is defined similarly to \Macro{markright}
- (see \autoref{sec:maincls.pagestyle},
- \autopageref{desc:maincls.cmd.markright}) in the {\LaTeX} kernel. Although
- \Macro{markleft} is not defined as an internal command, the direct use is
- not recommended.
-\end{Explain}
-\EndIndex{Cmd}{automark}%
-%
-\EndIndex{}{headings>manual}%
-\EndIndex{}{headings>automatic}%
-\EndIndex{}{headings>running}%
-
-
-\subsection{Formatting of Header and Footer}
-\label{sec:scrpage.basics.format}
-% \headfont \pnumfont
-% \setheadwidth \setfootwidth
-% \set(head|foot)(top|sep|bot)line
-The previous section concerned itself mainly with the contents of the
-header and footer. This is of course not sufficient to satisfy
-formative ambitions. Therefore we devote this section exclusively to
-this topic.
-
-\begin{Declaration}
- \Macro{headfont}\\
- \Macro{footfont}\\
- \Macro{pnumfont}
-\end{Declaration}%
-\BeginIndex{Cmd}{headfont}%
-\BeginIndex{Cmd}{footfont}%
-\BeginIndex{Cmd}{pnumfont}%
-The command \Macro{headfont} contains the commands which determine the font of
-header and footer lines. Command \Macro{footfont} contains the difference of
-the footer to that. The difference for the style of the page number is defined
-by the command \Macro{pnumfont}.
-\begin{Example}
- If, for example, one wants the header to be typeset in bold sans serif, the
- footer in non-bold sans serif, and the page number in a slanted serif style,
- then one can use the following definitions:
-\begin{lstcode}
- \renewcommand{\headfont}{\normalfont\sffamily\bfseries}
- \renewcommand*{\footfont}{\normalfont\sffamily}
- \renewcommand{\pnumfont}{\normalfont\rmfamily\slshape}
-\end{lstcode}
-\end{Example}
-\EndIndex{Cmd}{headfont}%
-\EndIndex{Cmd}{footfont}%
-\EndIndex{Cmd}{pnumfont}%
-
-\BeginIndex{FontElement}{pagehead}%
-\BeginIndex{FontElement}{pagefoot}%
-\BeginIndex{FontElement}{pagenumber}%
-From version 2.8p of the {\KOMAScript} classes a new unified user interface
-scheme is implemented for font attributes. If \Package{scrpage2} is used
-together with one of these classes, then it is recommended to set up font
-attributes in the manner described in \autoref{sec:maincls.textmarkup} from
-\autopageref{sec:maincls.textmarkup} onward.
-\begin{Example}
- Instead of \Macro{renewcommand} the command \Macro{setkomafont}
- should be used to configure the font attributes. The previous
- definitions can then be written as:
-\begin{lstcode}
- \setkomafont{pagehead}\normalfont\sffamily\bfseries}
- \setkomafont{pagefoot}{\normalfont\sffamily}
- \setkomafont{pagenumber}{\normalfont\rmfamily\slshape}
-\end{lstcode}
-\end{Example}
-\EndIndex{FontElement}{pagenumber}%
-\EndIndex{FontElement}{pagefoot}%
-\EndIndex{FontElement}{pagehead}%
-
-
-\begin{Declaration}
-\Macro{setheadwidth}\OParameter{shift}\Parameter{width}\\
-\Macro{setfootwidth}\OParameter{shift}\Parameter{width}
-\end{Declaration}%
-\BeginIndex{Cmd}{setheadwidth}%
-\BeginIndex{Cmd}{setfootwidth}%
-Normally the widths of header and footer lines correspond to the width of the
-text body. The commands
-\Macro{setheadwidth}\Index{header>width}\Index{head>width} and
-\Macro{setfootwidth}\Index{footer>width}\Index{foot>width} enable the user to
-adapt in a simple manner the widths to his needs. The mandatory argument
-\PName{width} takes the value of the desired width of the page header or
-footer, while \PName{shift} is a length parameter by which amount the
-appropriate item is shifted toward the outside page edge.
-
-For the most common situations the mandatory argument \PName{width}
-accepts the following symbolic values:
-\begin{labeling}[\,--]{\PValue{textwithmarginpar}}
-\item[\PValue{paper}] the width of the paper
-\item[\PValue{page}] the width of the page
-\item[\PValue{text}] the width of the text body
-\item[\PValue{textwithmarginpar}] the width of the text body including margin
-\item[\PValue{head}] the current header width
-\item[\PValue{foot}] the current footer width
-\end{labeling}
-The difference between \PValue{paper} and \PValue{page} is that
-\PValue{page} means the width of the paper less the binding correction
-if the package \Package{typearea}\IndexPackage{typearea} is used (see
-\autoref{cha:typearea}). Without \Package{typearea} both values are
-identical.
-
-\begin{Example}
- Assume that one wants a layout like that of \emph{The
- {\LaTeX}\,Companion}, where the header projects into the
- margin. This can be obtained with:
-\begin{lstcode}
- \setheadwidth[0pt]{textwithmarginpar}
-\end{lstcode}
-%
- which appears like this on an odd page:
-%
- \begin{XmpTopPage}
- \XmpHeading{10,25}{85}
- \thinlines\XmpRule{10,23}{85}
- \XmpSetText[\XmpTopText]{10,21}
- \XmpMarginNote{83,11.8}
- \end{XmpTopPage}
-%
- If the footer line should have the same width and alignment, then two
- ways to set this up are possible. The first way simply repeats the
- settings for the case of the footer line:
-\begin{lstcode}
- \setfootwidth[0pt]{textwithmarginpar}
-\end{lstcode}
-%
- In the second way the symbolic value \PValue{head} is used, since the
- header already has the desired settings.
-\begin{lstcode}
- \setfootwidth[0pt]{head}
-\end{lstcode}
-\end{Example}
-
-If no \PName{shift} is indicated, i.\,e., without the optional argument,
-then the header or footer appears arranged symmetrically on the page.
-In other words, a value for the \PName{shift} is determined
-automatically to correspond to the current page shape.
-%
-\begin{Example}
- Continuing with the previous example, we remove the optional
- argument:
-\begin{lstcode}
- \setheadwidth{textwithmarginpar}
-\end{lstcode}
-%
- which appears like this on an odd page:
-%
- \begin{XmpTopPage}
- \XmpHeading{5,25}{85}
- \thinlines\XmpRule{5,23}{85}
- \XmpSetText[\XmpTopText]{10,21}
- \XmpMarginNote{83,11.8}
- \end{XmpTopPage}
-\end{Example}
-
-As can be seen, the header is now shifted inward, while the header
-width has not changed. The shift is calculated in a way that the
-configuration of the typearea become visible also here.%
-%
-\EndIndex{Cmd}{setheadwidth}\EndIndex{Cmd}{setfootwidth}
-
-\begin{Declaration}
- \Macro{setheadtopline}\OParameter{length}\Parameter{thickness}%
- \OParameter{commands}\\
- \Macro{setheadsepline}\OParameter{length}\Parameter{thickness}%
- \OParameter{commands}\\
- \Macro{setfootsepline}\OParameter{length}\Parameter{thickness}%
- \OParameter{commands}\\
- \Macro{setfootbotline}\OParameter{length}\Parameter{thickness}%
- \OParameter{commands}
-\end{Declaration}%
-\BeginIndex{Cmd}{setheadtopline}\BeginIndex{Cmd}{setheadsepline}%
-\BeginIndex{Cmd}{setfootseptline}\BeginIndex{Cmd}{setfootbotline}%
-Corresponding to the size configuration parameters of header and
-footer there are commands to modify the rules above and below the
-header and footer. But first of all the rules should be activated. See options
-\Option{headtopline}, \Option{headsepline},
-\Option{footsepline}, and \Option{footbotline} in
-\autoref{sec:scrpage.basics.options},
-\autopageref{desc:scrpage.option.headsepline} for this.
-
-\begin{labeling}[\,--]{\Macro{setfootsepline}}
-\item[\Macro{setheadtopline}] configures the line above the header
-\item[\Macro{setheadsepline}] configures the line below the header
-\item[\Macro{setfootsepline}] configures the line above the footer
-\item[\Macro{setfootbotline}] configures the line below the footer
-\end{labeling}
-
-The mandatory argument \PName{thickness} determines how strongly the
-line is drawn. The optional argument \PName{length} accepts the same
-symbolic values as \PName{width} for \Macro{setheadwidth}, as well as
-also a normal length expression. As long as the optional argument
-\PName{length} is not assigned a value, the appropriate line length
-adapts automatically the width of the header or the footer.
-
-Use \PValue{auto} in the length argument to restore this automation
-for the length of a line.
-
-\BeginIndex{FontElement}{headtopline}%
-\BeginIndex{FontElement}{headsepline}%
-\BeginIndex{FontElement}{footsepline}%
-\BeginIndex{FontElement}{footbotline}%
-\BeginIndex{FontElement}{footbottomline}%
-The\ChangedAt{v2.2}{\Package{scrpage2}} optional argument \PName{commands} may
-be used to specify additional commands to be executed before the respective
-line is drawn. For example, such commands could be used for changing the
-color\Index{header>color}\Index{footer>color}%
-\Index{head>color}\Index{foot>color}%
-\Index{color>in header}\Index{color>in footer} of the line. When using a
-{\KOMAScript} class you could also use
-\Macro{setkomafont}\IndexCmd{setkomafont} to specify commands for one of the
-elements \FontElement{headtopline}\important[i]{\FontElement{headtopline}\\
- \FontElement{headsepline}\\
- \FontElement{footsepline}\\
- \FontElement{footbottomline}}, \FontElement{headsepline},
-\FontElement{footsepline}, \FontElement{footbottomline}, or
-\FontElement{footbotline}. These can then be extended via
-\Macro{addtokomafont}\IndexCmd{addtokomafont}. See
-\autoref{sec:maincls.textmarkup}, \autopageref{desc:maincls.cmd.setkomafont}
-for details on the \Macro{setkomafont} and \Macro{addtokomafont} commands.
-\EndIndex{FontElement}{footbottomline}%
-\EndIndex{FontElement}{footbotline}%
-\EndIndex{FontElement}{footsepline}%
-\EndIndex{FontElement}{headsepline}%
-\EndIndex{FontElement}{headtopline}%
-
-
-\begin{Declaration}
- \XMacro{setheadtopline}\OParameter{\upshape\PValue{auto}}%
- \Parameter{\upshape\PValue{current}}\\
- \XMacro{setheadtopline}\OParameter{\upshape\PValue{auto}}%
- \Parameter{}\\
- \XMacro{setheadtopline}\OParameter{\upshape\PValue{auto}}%
- \Parameter{}\OParameter{}
-\end{Declaration}%
-The arguments shown here for the command \Macro{setheadtopline} are of
-course valid for the other three configuration commands too.
-
-If the mandatory parameter has the value \PValue{current} or has been
-left empty, then the line thickness is not changed. This may be used
-to modify the length of the line without changing its thickness.
-
-If the optional argument \PName{commands} is omitted, then all command
-settings that might have been specified before will remain active,
-while an empty \PName{commands} argument will revoke any previously
-valid commands.
-
-\begin{Example}
- If the header, for example, is to be contrasted by a strong line of
- 2\,pt above and a normal line of 0.4\,pt between header and body,
- one can achieve this with:
-\begin{lstcode}
- \setheadtopline{2pt}
- \setheadsepline{.4pt}
-\end{lstcode}
- Additionally\textnote{Attention!} the options \Option{headtopline} and
- \Option{headsepline} have to be used preferably globally in the optional
- argument of \Macro{documentclass}. In this case the result may be the
- following.
-%
-\begin{XmpTopPage}
- \XmpHeading{10,25}{70}
- \thinlines\XmpRule{10,23}{70}
- \thicklines\XmpRule{10,28}{70}
- \XmpSetText[\XmpTopText]{10,21}
- \XmpMarginNote{83,11.8}
-\end{XmpTopPage}
-
- To specify that this line is to be drawn also, e.\,g., in red color, you
- would change the commands like this:
-\begin{lstcode}
- \setheadtopline{2pt}[\color{red}]
- \setheadsepline{.4pt}[\color{red}]
-\end{lstcode}
- In this example, as well as in the following one, line color is
- activated by applying the syntax of the
- \Package{color}\IndexPackage{color} package, so this package must of
- course be loaded. Since \Package{scrpage2} comes without built-in
- color handling, any package providing color support may be used.
-
- {\KOMAScript} classes also support the following way of color specification:
-\begin{lstcode}
- \setheadtopline{2pt}
- \setheadsepline{.4pt}
- \setkomafont{headtopline}[\color{red}]
- \setkomafont{headsepline}[\color{red}]
-\end{lstcode}
-
- The automatic adjustment to the header and footer width is illustrated
- in the following example:
-\begin{lstcode}
- \setfootbotline{2pt}
- \setfootsepline[text]{.4pt}
- \setfootwidth[0pt]{textwithmarginpar}
-\end{lstcode}
-
-% \phantomsection for hyperref-\pageref-links jum-2001/11/24
- \phantomsection\label{page:scrpage.autoLineLength}
- \begin{XmpBotPage}
- \XmpHeading{10,18}{85}
- \thinlines\XmpRule{17,21}{70}
- \thicklines\XmpRule{10,16}{85}
- \XmpSetText[\XmpBotText]{10,33}
- \XmpMarginNote{83,24}
- \end{XmpBotPage}
-\end{Example}
-%
-Now not everyone will like the alignment of the line above the footer;
-instead, one would expect the line to be left-aligned. This can only
-be achieved with a global package option, which will be described
-together with other package options in the next
-\autoref{sec:scrpage.basics.options}.%
-%
-\EndIndex{Cmd}{setheadtopline}\EndIndex{Cmd}{setheadsepline}
-\EndIndex{Cmd}{setfootseptline}\EndIndex{Cmd}{setfootbotline}
-
-
-\subsection{Package Options}
-\label{sec:scrpage.basics.options}
-% head(in|ex)clude foot(in|ex)clude --> typearea
-% headtopline headsepline footbotline footsepline (plain...)
-% komastyle standardstyle
-% markuppercase markusecase
-% automark manualmark
-
-In opposite to the \KOMAScript{} classes, where the most options may be
-changed using \Macro{KOMAoptions} or \Macro{KOMAoption} also after loading the
-class, package \Package{scrpage2} does not provide this feature\iffree{
- currently}{}. All options to \Package{scrpage2} have to be global options,
-i.\,e. be part of the optional argument of \Macro{documentclass}, or
-package option, i.\,e. be part of the optional argument of \Macro{usepackage}.
-
-\begin{Declaration}
-\Option{headinclude}\\
-\Option{headexclude}\\
-\Option{footinclude}\\
-\Option{footexclude}
-\end{Declaration}%
-\BeginIndex{Option}{headinclude}\BeginIndex{Option}{footinclude}%
-\BeginIndex{Option}{headexclude}\BeginIndex{Option}{footexclude}%
-Since\textnote{Attention!} \KOMAScript~3\ChangedAt{v2.3}{\Package{scrpage2}}
-this options should not be passed to \Package{scrpage2} any longer using
-\Macro{PassOptionsToPackage} or the optional argument of
-\Macro{usepackage}. Only for compatibility reason \Package{scrpage2} still
-declares them and pass them as \Option{headinclude},
-\OptionValue{headinclude}{false}, \Option{footinclude} und
-\OptionValue{footinclude}{false} to package \Package{typearea} (see
-\autoref{sec:typearea.typearea},
-\autopageref{desc:typearea.option.headinclude}) weitergereicht.
-\EndIndex{Option}{headinclude}\EndIndex{Option}{footinclude}%
-\EndIndex{Option}{headexclude}\EndIndex{Option}{footexclude}
-
-
-\begin{Declaration}
- \Option{headtopline}\\
- \Option{plainheadtopline}\\
- \Option{headsepline}\\
- \Option{plainheadsepline}\\
- \Option{footsepline}\\
- \Option{plainfootsepline}\\
- \Option{footbotline}\\
- \Option{plainfootbotline}
-\end{Declaration}%
-\BeginIndex{Option}{headtopline}\BeginIndex{Option}{plainheadtopline}%
-\BeginIndex{Option}{headsepline}\BeginIndex{Option}{plainheadsepline}%
-\BeginIndex{Option}{footsepline}\BeginIndex{Option}{plainfootsepline}%
-\BeginIndex{Option}{footbotline}\BeginIndex{Option}{plainfootbotline}%
-Basic adjustment of the lines under and over header and footer can be
-made with these options. These adjustments are then considered the
-default for all page styles defined with \Package{scrpage2}. If one
-of these options is used, then a line thickness 0.4\,pt is set.
-Since there is a corresponding plain page style to the
-page style \Pagestyle{scrheadings}, the corresponding line in the plain
-style can also be configured with the \Option{plain\dots} options.
-These \Option{plain} options do however work only if the corresponding
-options without \Option{plain} are activated. Thus,
-\Option{plainheadtopline} shows no effect without the
-\Option{headtopline} option set.
-
-With these options, it is to be noted that the appropriate page part,
-header or footer, is considered as a part of the text area for the
-calculation of the type area in case a line has been activated. This
-means that, if the separation line between header and text is
-activated with \Option{headsepline}, then the package
-\Package{typearea} calculates the type area in such a way that the
-page header is part of the text block automatically.
-
-The\textnote{Attention!} conditions for the options of the preceding paragraph
-apply also to this automation. That means that the package \Package{typearea}
-must be loaded after \Package{scrpage2}, or that on use of a {\KOMAScript}
-class, the options \Option{headinclude} and \Option{footinclude} must be set
-explicitly with \Macro{documentclass} in order to transfer header or footer
-line in the text area.%
-%
-\EndIndex{Option}{headtopline}\EndIndex{Option}{plainheadtopline}
-\EndIndex{Option}{headsepline}\EndIndex{Option}{plainheadsepline}
-\EndIndex{Option}{footsepline}\EndIndex{Option}{plainfootsepline}
-\EndIndex{Option}{footbotline}\EndIndex{Option}{plainfootbotline}
-
-\begin{Declaration}
-\Option{ilines}\\
-\Option{clines}\\
-\Option{olines}
-\end{Declaration}%
-\BeginIndex{Option}{ilines}%
-\BeginIndex{Option}{clines}%
-\BeginIndex{Option}{olines}%
-\Index{rule>alignment}\Index{line>alignment}%
-With the definition of the line lengths the case can arise where the
-lengths are set correctly, but the justification is not as desired
-because the line will be centered in the header or footer area. With
-the package options presented here, this specification can be modified
-for all page styles defined with \Package{scrpage2}. The option
-\Option{ilines} sets the justification in such a way that the lines
-align to the inside edge. The option \Option{clines} behaves like the
-default justification, and \Option{olines} aligns at the outside edge.
-
-\begin{Example}
- The next example illustrates the influence of the
- option \Option{ilines}. Please compare to the example for
- \Macro{setfootsepline} on \autopageref{page:scrpage.autoLineLength}.
-\begin{lstcode}
- \usepackage[ilines]{scrpage2}
- \setfootbotline{2pt}
- \setfootsepline[text]{.4pt}
- \setfootwidth[0pt]{textwithmarginpar}
-\end{lstcode}
- The mere use of the option \Option{ilines} leads to the different
- result shown below:
-\begin{XmpBotPage}
- \XmpHeading{10,18}{85}
- \thinlines\XmpRule{10,21}{70}
- \thicklines\XmpRule{10,16}{85}
- \XmpSetText[\XmpBotText]{10,33}
- \XmpMarginNote{83,24}
-\end{XmpBotPage}
- In contrast to the default configuration, the separation line between
- text and footer is now left-aligned, not centered.%
-\end{Example}%
-\EndIndex{Option}{ilines}%
-\EndIndex{Option}{clines}%
-\EndIndex{Option}{olines}%
-
-
-\begin{Declaration}
-\Option{automark}\\
-\Option{manualmark}
-\end{Declaration}%
-\BeginIndex{Option}{automark}%
-\BeginIndex{Option}{manualmark}%
-\BeginIndex{}{headings>automatic}%
-\BeginIndex{}{headings>manual}%
-These options set at the beginning of the document whether to use running
-headings or manual ones. The option \Option{automark} switches the automatic
-updating on, \Option{manualmark} deactivates it. Without the use of one of
-the two options, the setting which was valid when the package was loaded is
-preserved.
-%
-\begin{Example}
- You load the package \Package{scrpage2} directly after the document class
- \Class{scrreprt} without any package options:
-\begin{lstcode}
- \documentclass{scrreprt}
- \usepackage{scrpage2}
-\end{lstcode}
- Since the default page style of \Class{scrreprt} is \Pagestyle{plain},
- this page style is also now still active. Futhermore, \Pagestyle{plain}
- means manual headings. If one now activates the page style
- \Pagestyle{scrheadings} with
-\begin{lstcode}
- \pagestyle{scrheadings}
-\end{lstcode}
- then the manual headings are nevertheless still active.
-
- If you instead use the document class \Class{scrbook}, then after
-\begin{lstcode}
- \documentclass{scrbook}
- \usepackage{scrpage2}
-\end{lstcode}
- the page style \Pagestyle{headings} is active and the running headings are
- updated automatically. Switching to the page style
- \Pagestyle{scrheadings} keeps this setting active. The marking commands
- of \Class{scrbook} continue to be used.
-
- However, the use of
-\begin{lstcode}
- \usepackage[automark]{scrpage2}
-\end{lstcode}
- activates running headings independently of the used document class.
- The option does not of course affect the used page style \Pagestyle{plain}
- of the class \Class{scrreprt}. The headings are not visible until the
- page style is changed to
- \Pagestyle{scrheadings}\IndexPagestyle{scrheadings}, \Pagestyle{useheadings}
- or another user-defined page style with headings.%
-\end{Example}%
-\EndIndex{Option}{automark}\EndIndex{Option}{manualmark}%
-
-\begin{Declaration}
- \Option{autooneside}
-\end{Declaration}%
-\BeginIndex{Option}{autooneside}%
-This option ensures that the optional parameter of
-\Macro{automark}\IndexCmd{automark} will be ignored automatically in
-one-sided mode. See also the explanation of the command
-\Macro{automark} in \autoref{sec:scrpage.basics.mark},
-\autopageref{desc:scrpage.cmd.automark}.%
-%
-\EndIndex{Option}{autooneside}%
-%
-\EndIndex{}{headings>manual}%
-\EndIndex{}{headings>automatic}%
-
-
-\begin{Declaration}
- \Option{komastyle}\\
- \Option{standardstyle}
-\end{Declaration}%
-\BeginIndex{Option}{komastyle}%
-\BeginIndex{Option}{standardstyle}%
-These options determine the look of the predefined page styles
-\Pagestyle{scrheadings} and \Pagestyle{scrplain}. The option
-\Option{komastyle} configures a look like that of the {\KOMAScript} classes.
-This is the default for {\KOMAScript} classes and can in this way also be set
-for other classes.
-
-The option \Option{standardstyle} configures a page style as it is
-expected by the standard classes. Furthermore, the option
-\Option{markuppercase} will be activated automatically, but only if
-option \Option{markusedcase} is not given.%
-\EndIndex{Option}{komastyle}%
-\EndIndex{Option}{standardstyle}
-
-
-\begin{Declaration}
-\Option{markuppercase}\\
-\Option{markusedcase}
-\end{Declaration}%
-\BeginIndex{Option}{markuppercase}%
-\BeginIndex{Option}{markusedcase}%
-In order to achieve the functionality of \Macro{automark}, the package
-\Package{scrpage2} modifies internal commands which are used by the
-document structuring commands to set the running headings. Since some
-classes, in contrast to the {\KOMAScript} classes, write the headings
-in uppercase letters, \Package{scrpage2} has to know how the used
-document class sets the headings.
-
-Option \Option{markuppercase} shows \Package{scrpage2} that the document class
-uses uppercase letters. If the document class does not set the headings in
-uppercase letters, then the option \Option{markusedcase} should be given.
-These\textnote{Attention!} options are not suitable to force a representation;
-thus, unexpected effects may occur if the given option does not match the
-actual behaviour of the document class.%
-\EndIndex{Option}{markuppercase}\EndIndex{Option}{markusedcase}
-
-
-\begin{Declaration}
- \Option{nouppercase}
-\end{Declaration}%
-\BeginIndex{Option}{nouppercase}%
-In the previous paragraph dealing with \Option{markuppercase} and
-\Option{markusedcase}, it has been already stated that some document classes
-set the running headings\Index{heading} in uppercase letters using the
-commands
-\Macro{MakeUppercase}\IndexCmd{MakeUppercase}\important{\Macro{MakeUppercase}}
-or \Macro{uppercase}\IndexCmd{uppercase}\important{\Macro{uppercase}}.
-Setting the option \Option{nouppercase} allows disabling both these commands
-in the headers and footers. However, this is valid only for page styles
-defined by \Package{scrpage2}, including \Pagestyle{scrheadings} and its
-corresponding plain page style.
-
-The applied method is very brutal and can cause that desired changes
-of normal letters to uppercase letters \Index{uppercase letters} do
-not occur. Since these cases do not occur frequently, the option
-\Option{nouppercase} usually affords a useful solution.
-\begin{Example}
- Your document uses the standard class \Class{book}\IndexClass{book},
- but you do not want the uppercase headings but mixed case
- headings. Then the preamble of your document could start with:
-\begin{lstcode}
- \documentclass{book}
- \usepackage[nouppercase]{scrpage2}
- \pagestyle{scrheadings}
-\end{lstcode}
- The selection of the page style \Pagestyle{scrheadings} is necessary,
- since otherwise the page style \Pagestyle{headings} is active, which
- does not respect the settings made by option \Option{nouppercase}.
-\end{Example}
-
-In some cases not only classes but also packages set the running
-headings in uppercase letters.
-Also in these cases the option \Option{nouppercase} should be able
-to switch back to the normal mixed case headings.%
-%
-\EndIndex{Option}{nouppercase}
-
-
-\section{Defining Own Page Styles}\label{sec:scrpage.UI}
-%
-%
-\subsection{The Interface for Beginners}\label{sec:scrpage.UI.user}
-% \deftripstyle
-\BeginIndex{Cmd}{deftripstyle}\Index{page>style}
-
-Now one would not like to remain bound to only the provided page
-styles, but may wish to define one's own page styles. Sometimes there
-will be a special need, since a specific \emph{Corporate Identity} may
-require the declaration of its own page styles. The easiest way to
-deal with this is:
-\begin{Declaration}
-\Macro{deftripstyle}\Parameter{name}%
-\OParameter{LO}\OParameter{LI}%
-\Parameter{HI}\Parameter{HC}\Parameter{HO}%
-\Parameter{FI}\Parameter{FC}\Parameter{FO}
-\end{Declaration}%
-The individual parameters have the following meanings:
-\begin{labeling}[\,--]{\PName{Name}}
-\item[\PName{name}] the name of the page style, in order to activate it
- using the command \Macro{pagestyle}\Parameter{name}
-\item[\PName{LO}] the thickness of the outside lines,
- i.\,e., the line above the header
- and the line below the footer (optional)
-\item[\PName{LI}] the thickness of the separation lines,
- i.\,e., the line below the header
- and the line above the foot (optional)
-\item[\PName{HI}] contents of the inside box in the page header for two-sided
- layout or left for one-sided layout
-\item[\PName{HC}] contents of the centered box in the page header
-\item[\PName{HO}] contents of the outside box in the page header for two-sided
- layout or right for one-sided layout
-\item[\PName{FI}] contents of the inside box in the page footer for two-sided
- layout or left for one-sided layout
-\item[\PName{FC}] contents of the centered box in the page footer
-\item[\PName{FO}] contents of the outside box in the page footer for two-sided
- layout or right for one-sided layout
-\end{labeling}
-
-The command \Macro{deftripstyle} definitely represents the simplest
-possibility of defining page styles. Unfortunately, there are also
-restrictions connected with this, since in a page range using a page
-style defined via deftripstyle, no modification of the lines above and
-below header and footer can take place.
-
-\begin{Example}
- Assume a two-sided layout, where the running headings are placed on
- the inside. Furthermore, the document title, here ``Report'', shall
- be placed outside in the header, the page number shall be centered
- in the footer.
-\begin{lstcode}
- \deftripstyle{TheReport}%
- {\headmark}{}{Report}%
- {}{\pagemark}{}
-\end{lstcode}
-
- If moreover the lines above the header and below the footer shall be
- drawn with a thickness of 2\,pt, and the text body be separated from
- header and footer with 0.4\,pt lines, then the definition has to be
- extended:
-\begin{lstcode}
- \deftripstyle{TheReport}[2pt][.4pt]%
- {\headmark}{}{Report}%
- {}{\pagemark}{}
-\end{lstcode}
- See \autoref{fig:scrpage2.tomuchlines} for the result.
-%
-\begin{figure}
- \typeout{^^J--- Ignore underfull and overfull \string\hbox:}
- \setcapindent{0pt}%
-% \begin{center}
- \begin{captionbeside}
- [{%
- Example of a user defined, line dominated page style%
- }]{%
- example of a user defined, line dominated page style
- with a static and a running heading at the page header and a page number
- centered at the page footer%
- \label{fig:scrpage2.tomuchlines}%
- }
- [l]
- \iffree{\setlength{\unitlength}{1.15mm}}{\setlength{\unitlength}{1mm}}%
- \begin{picture}(85,51)\scriptsize
- \thinlines
- \put(0,0){\line(0,1){51}}
- \put(45,0){\line(0,1){51}}
- \put(0,51){\line(1,0){40}}
- \put(45,51){\line(1,0){40}}
- %
- \thicklines
- \put(40,0){\line(0,1){51}}
- \put(85,0){\line(0,1){51}}
- \put(0,0,){\line(1,0){40}}
- \put(45,0){\line(1,0){40}}
- %
- \XmpHeading[Report\hfill 2. The Eye]{6,47}{30}
- \XmpHeading[2.1 Retina\hfill Report]{49,47}{30}
- \XmpHeading[\hfill 14\hfill]{6,6.5}{30}
- \XmpHeading[\hfill 15\hfill]{49,6.5}{30}
- \put(6,44){\makebox(0,0)[tl]{\parbox{30\unitlength}{\tiny%
- \textbf{2.1 Retina}\\
- \XmpText[49]}}}
- \put(49,44){\makebox(0,0)[tl]{\parbox{30\unitlength}{\tiny%
- \XmpText[51]}}}
- %
- \thinlines
- \XmpRule{6,45.5}{30}\XmpRule{49,45.5}{30}
- \XmpRule{6,8}{30}\XmpRule{49,8}{30}
- \linethickness{1pt}
- \XmpRule{6,49}{30}\XmpRule{49,49}{30}
- \XmpRule{6,5}{30}\XmpRule{49,5}{30}
- \end{picture}
-% \end{center}
- \end{captionbeside}
- \typeout{^^J--- Don't ignore underfull and overfull \string\hbox:^^J}
-\end{figure}
-\end{Example}
-\EndIndex{Cmd}{deftripstyle}
-
-
-\subsection{The Interface for Experts}\label{sec:scrpage.UI.expert}
-% \defpagestyle \newpagestyle \providepagestyle \renewpagestyle
-\Index{page>style}
-Simple page styles, as they can be defined with \Macro{deftripstyle},
-are fairly rare according to experience. Either a professor requires
-that the thesis looks like his or her own\,---\,and who seriously wants
-to argue against such a wish?\,---\,or a company would like that half the
-financial accounting emerges in the page footer. No problem, the
-solution is:
-%
-\begin{Declaration}
-\Macro{defpagestyle}\Parameter{name}\Parameter{header definition}\Parameter{footer definition}\\
-\Macro{newpagestyle}\Parameter{name}\Parameter{header definition}\Parameter{footer definition}\\
-\Macro{renewpagestyle}\Parameter{name}\Parameter{header definition}\Parameter{footer definition}\\
-\Macro{providepagestyle}\Parameter{name}\Parameter{header definition}\Parameter{footer definition}
-\end{Declaration}%
-\BeginIndex{Cmd}{defpagestyle}\BeginIndex{Cmd}{newpagestyle}%
-\BeginIndex{Cmd}{renewpagestyle}\BeginIndex{Cmd}{providepagestyle}%
-These four commands give full access to the capabilities of
-\Package{scrpage2} to define page styles. Their structure is
-indentical, they differ only in the manner of working.
-\begin{labeling}[\ --]{\Macro{providepagestyle}}
-\item[\Macro{defpagestyle}] defines a new page style.
-If a page style with this name already exists it will be overwritten.
-\item[\Macro{newpagestyle}] defines a new page style.
-If a page style with this name already exists a error message will be given.
-\item[\Macro{renewpagestyle}] redefines a page style.
-If a page style with this name does not exist a error message will be given.
-\item[\Macro{providepagestyle}] defines a new page style only if there is no page style with that name already present.
-\end{labeling}
-
-Using \Macro{defpagestyle} as an example, the syntax of the four
-commands is explained below.
-\begin{labeling}[~--]{\PName{head definition}}
-\item[\PName{name}] the name of the page style for
- \Macro{pagestyle}\Parameter{name}
-\item[\PName{header definition}] the declaration of the header, consisting
- of five element; elements in round parenthesis are optional:\hfill\\
- \hspace*{1em}\AParameter{ALL,ALT}%
- \Parameter{EP}\Parameter{OP}\Parameter{OS}\AParameter{BLL,BLT}
-\item[\PName{footer definition}] the declaration of the footer, consisting
- of five element; elements in round parenthesis are optional:\hfill\\
- \hspace*{1em}\AParameter{ALL,ALT}%
- \Parameter{EP}\Parameter{OP}\Parameter{OS}\AParameter{BLL,BLT}
-\end{labeling}
-
-As can be seen, header and footer declaration have identical
-structure. The individual parameters have the following meanings:
-\begin{labeling}[\ --]{\PName{OLD}}
-\item[\PName{ALL}] above line length: (header = outside, footer = separation
- line)
-\item[\PName{ALT}] above line thickness
-\item[\PName{EP}] definition for \emph{even} pages
-\item[\PName{OP}] definition for \emph{odd} pages
-\item[\PName{OS}] definition for \emph{one-sided} layout
-\item[\PName{BLL}] below line length: (header = separation line, footer =
- outside)
-\item[\PName{BLT}] below line thickness
-\end{labeling}
-
-If the optional line-parameters are omitted, then the line behaviour remains
-configurable by the commands introduced in
-\autoref{sec:scrpage.basics.format},
-\autopageref{desc:scrpage.cmd.setheadtopline}.
-
-The three elements \PName{EP}, \PName{OP} and \PName{OS} are boxes with the
-width of page header or footer, as appropriate. The corresponding definitions
-are set left-justified in the boxes. To set something left- \emph{and}
-right-justified into the boxes, the space between two text elements can be
-stretched using \Macro{hfill}:
-%
-\begin{lstcode}[belowskip=\dp\strutbox]
- {\headmark\hfill\pagemark}
-\end{lstcode}
-
-If one would like a third text-element centered in the box, then an
-extended definition must be used. The commands \Macro{rlap} and
-\Macro{llap} simply write the given arguments, but for {\LaTeX} they
-take up no horizontal space. Only in this way is the middle text
-really centered.
-%
-\begin{lstcode}
- {\rlap{\headmark}\hfill centered text\hfill\llap{\pagemark}}
-\end{lstcode}
-
-\iffalse% Umbruchkorrekturtext
-This and the use of the expert interface in connection with other
-commands provided by \Package{scpage2} follows now in the final
-example.
-\fi
-
-\begin{Example}
- This examples uses the document class \Class{scrbook}, which means
- that the default page layout is two-sided. The package
- \Package{scrpage2} is loaded with options \Option{automark} and
- \Option{headsepline}. The first switches on the automatic update of
- running headings, the second determines that a separation line
- between header and text body is drawn in the \Pagestyle{scrheadings}
- page style.
-
-\begin{lstcode}
- \documentclass{scrbook}
- \usepackage[automark,headsepline]{scrpage2}
-\end{lstcode}
-
- The expert interface is used to define two page styles. The page
- style \PValue{withoutLines} does not define any line parameters. The
- second page style \PValue{withLines} defines a line thicknes of 1\,pt
- for the line above the header and 0\,pt for the separation line
- between header and text.
-
-\begin{lstcode}
- \defpagestyle{withoutLines}{%
- {Example\hfill\headmark}{\headmark\hfill without lines}
- {\rlap{Example}\hfill\headmark\hfill%
- \llap{without lines}}
- }{%
- {\pagemark\hfill}
- {\hfill\pagemark}
- {\hfill\pagemark\hfill}
- }
-\end{lstcode}
-
-\begin{lstcode}
- \defpagestyle{withLines}{%
- (\textwidth,1pt)
- {with lines\hfill\headmark}{\headmark\hfill with lines}
- {\rlap{\KOMAScript}\hfill \headmark\hfill%
- \llap{with lines}}
- (0pt,0pt)
- }{%
- (\textwidth,.4pt)
- {\pagemark\hfill}
- {\hfill\pagemark}
- {\hfill\pagemark\hfill}
- (\textwidth,1pt)
- }
-\end{lstcode}
-
- Right at the beginning of the document the page style
- \Pagestyle{scrheadings} is activated. The command \Macro{chapter} starts
- a new chapter and automatically sets the page rstyle for this page to
- \Pagestyle{plain}. Even though not a prime example, the command
- \Macro{chead} shows how running headings can be created even on a
- plain page. However, in principle running headings on
- chapter start-pages are to be avoided, since otherwise the special
- character of the \Pagestyle{plain} page style is lost. It is more
- important to indicate that a new chapter starts here than that a
- section of this page has a special title.
-
-\begin{lstcode}
- \begin{document}
- \pagestyle{scrheadings}
- \chapter{Thermodynamics}
- \chead[\leftmark]{}
- \section{Main Laws}
- Every system has an extensive state quantity called
- Energy. In a closed system the energy is constant.
-\end{lstcode}
-
- \begin{XmpTopPage}
- \XmpHeading[\hfill\textsl{1. Thermodynamics}\hfill]{10,27}{70}
- \put(10,17){\normalsize\textbf{\sffamily 1.Thermodynamics}}
- \put(10,12){\textbf{\sffamily 1.1 Main Laws}}
- \XmpSetText[%
- Every System has an extensive state quantity]{10,9}
- \end{XmpTopPage}
-
- After starting a new page the page style \Pagestyle{scrheadings} is
- active and thus the separation line below the header is visible.
-\begin{lstcode}
- There is a state quatity of a system, called entropy, whose temporal
- change consists of entropy flow and entropy generation.
-\end{lstcode}
- \begin{XmpTopPage}
- \XmpHeading[\textsl{1. Thermodynamics}\hfill]{20,27}{70}
- \thinlines\XmpRule{20,25}{70}
- \XmpSetText[%
- There is a condition unit of a system, called entropy,
- whose temporal change consists of entropy flow
- and entropy generation.]{20,20}
- \end{XmpTopPage}
-
- After switching to the next page, the automatic update of the running
- headings is disabled using \Macro{manualmark}, and the page style
- \PValue{withoutLines} becomes active. Since no line parameters are
- given in the definition of this page style, the default configuration
- is used, which draws a separation line between header and text body
- because \Package{scrpage2} was called with \Option{headsepline}.
-\begin{lstcode}
- \manualmark
- \pagestyle{withoutLines}
- \section{Exergy and Anergy}\markright{Energy Conversion}
- During the transition of a system to an equilibrium state
- with its environment, the maximum work gainable is called
- exergy.
-\end{lstcode}
- \begin{XmpTopPage}
- \XmpHeading[\slshape Energy Conversion\hfill without lines]{10,27}{70}
- \thinlines\XmpRule{10,25}{70}
- \XmpSetText[\setlength{\parfillskip}{0pt plus 1fil}%
- \textbf{\sffamily 1.2 Exergy and Anergy}\\
- During the transition of a system to an equilibrium state
- with its environment, the maximum work gainable is called
- exergy.]{10,21}
- \end{XmpTopPage}
-
- At the next page of the document, the page style \PValue{withLines} is
- activated. The line settings of its definition are taken in account
- and the lines are drawn accordingly.
-\begin{lstcode}
- \pagestyle{mitLinien}
- \renewcommand{\headfont}{\itshape\bfseries}
- The portion of an energy not convertible in exergy
- is named anergy \Var{B}.
- \[ B = U + T (S_1 - S_u) - p (V_1 - V_u)\]
- \end{document}
-\end{lstcode}
- \begin{XmpTopPage}
- \XmpHeading[\itshape\bfseries with lines\hfill 1. Thermodynamics]{20,27}{70}
- \thicklines\XmpRule{20,29}{70}
- \XmpSetText[\setlength{\parfillskip}{0pt plus 1fil}%
- The portion of an energy not convertible in exergy
- is named anergy $B$.
- \[ B = U + T (S_1 - S_u) - p (V_1 - V_u)\] ]{20,20}
- \end{XmpTopPage}
-\end{Example}
-\EndIndex{Cmd}{defpagestyle}\EndIndex{Cmd}{newpagestyle}
-\EndIndex{Cmd}{renewpagestyle}\EndIndex{Cmd}{providepagestyle}
-
-
-\subsection{Managing Page Styles}\label{sec:scrpage.UI.cfgFile}
-% scrpage.cfg
-\BeginIndex{File}{scrpage.cfg}
-Before long the work with different page styles will establish a
-common set of employed page styles, depending on taste and tasks. In
-order to make the management of page styles easier and avoid
-time-consuming copy operations each time a new project is started,
-\Package{scrpage2} reads the file \File{scrpage.cfg} after
-initialisation. This file can contain a set of user-defined page
-styles which many projects can share.
-\EndIndex{File}{scrpage.cfg}
-\EndIndex{Package}{scrpage2}
-
-\endinput
-
-
-%%% Local Variables:
-%%% mode: latex
-%%% coding: us-ascii
-%%% TeX-master: "../guide"
-%%% End:
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrwfile.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrwfile.tex
index 9d69c9d2fc7..8003dffb7cf 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrwfile.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrwfile.tex
@@ -1,53 +1,58 @@
-%%
-%% This is file `scrwfile.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% scrwfile.dtx (with options: `doc')
-%%
-%% Copyright (c) 2010-2013 by Markus Kohm <komascript(at)gmx.info>
-%%
-%% This file was generated from file(s) of the KOMA-Script bundle.
-%% ---------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3c of the license.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later and of this work.
-%%
-%% This work has the LPPL maintenance status "author-maintained".
-%%
-%% The Current Maintainer and author of this work is Markus Kohm.
-%%
-%% This file may only be distributed together with the file
-%% `scrwfile.dtx' and `scrlogo.dtx'. You may however distribute the files
-%% `scrwfile.dtx' and `scrlogo.dtx' without this file.
-%%
-%% If this file is a beta version, you are not allowed to distribute it.
-%%
-%% English and German manuals are part of KOMA-Script bundle.
-%% ----------------------------------------------------------
-%%
-%% The english manual is at `scrwfile.dtx', too.
-%%
-%% The KOMA-Script bundle (but not this file) was based upon the LaTeX2.09
-%% Script family created by Frank Neukam 1993 and the LaTeX2e standard
-%% classes created by The LaTeX3 Project 1994-1996.
-%%
-%% THIS IS AN ALPHA VERSION!
-%% USAGE OF THIS VERSION IS ON YOUR OWN RISK!
-%% EVERYTHING MAY HAPPEN!
-%% EVERYTHING MAY CHANGE IN FUTURE!
-%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
-%%
-%%% From File: $Id: scrwfile.dtx 1562 2013-12-19 07:51:16Z mjk $
-\ProvidesFile{scrwfile.tex}
- [2013/08/05 v0.1f-alpha LaTeX2e KOMA-Script package (write and clone files)]
-\chapter[{Spare and Replace Files Using \Package{scrwfile}}]
-{Spare and Replace Files Using \Package{scrwfile}%
+% ======================================================================
+% scrwfile.tex
+% Copyright (c) Markus Kohm, 2010-2014
+%
+% This file is part of the LaTeX2e KOMA-Script bundle.
+%
+% This work may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c of the license.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later and of this work.
+%
+% This work has the LPPL maintenance status "author-maintained".
+%
+% The Current Maintainer and author of this work is Markus Kohm.
+%
+% This work consists of all files listed in manifest.txt.
+% ----------------------------------------------------------------------
+% scrwfile.tex
+% Copyright (c) Markus Kohm, 2010-2014
+%
+% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
+% Version 1.3c, verteilt und/oder veraendert werden.
+% Die neuste Version dieser Lizenz ist
+% http://www.latex-project.org/lppl.txt
+% und Version 1.3c ist Teil aller Verteilungen von LaTeX
+% Version 2005/12/01 oder spaeter und dieses Werks.
+%
+% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
+% (allein durch den Autor verwaltet).
+%
+% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm.
+%
+% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
+% ======================================================================
+%
+% Chapter about scrwfile of the KOMA-Script guide
+% Maintained by Markus Kohm
+%
+% ----------------------------------------------------------------------
+%
+% Kapitel ueber scrwfile in der KOMA-Script-Anleitung
+% Verwaltet von Markus Kohm
+%
+% ============================================================================
+
+\KOMAProvidesFile{scrwfile.tex}%
+ [$Date: 2014-10-16 08:48:50 +0200 (Thu, 16 Oct 2014) $
+ KOMA-Script guide (chapter: scrwfile)]
+
+\translator{Markus Kohm\and Jana Schubert}
+
+\chapter[{Economise and Replace Files Using \Package{scrwfile}}]
+{Economise and Replace Files Using \Package{scrwfile}%
}
\labelbase{scrwfile}
@@ -68,61 +73,60 @@ The bottom line is, that this eventually will result in the error message:
\fi
\end{lstcode}
-Last but not least, immediately opening one more write handle for every table
-of contents, list of figures, list of tables, and so on has one more
-disadvantage. These are not only set by the corresponding commands, they also
-couldn't not be set once more, because their helper files are empty after the
-corresponding commands until the end of the document.
+There is an additional disadvantage of immediately opening a new write handle
+for every table of contents, list of figures, list of tables etc. These are
+not only set by the corresponding commands, they also could not be set once
+more, because their helper files are empty after the corresponding commands
+until the end of the document.
-Package \Package{scrwfile} provides a general change of the \LaTeX{} kernel,
-that may solve both problems.
+Package \Package{scrwfile} provides an amendment of the \LaTeX{} kernel,
+that solves both problems.
\section{General Modifications of the \LaTeX{} Kernel}
\label{sec:scrwfile.kernelpatches}
-\LaTeX{} classes use the \LaTeX{} kernel command
-\Macro{@starttoc}\IndexCmd{@starttoc} for output and opening of a new table of
-contents, list of float, e.\,g., \Macro{listoffigures} or
-\Macro{listoftables}, or similar. Thereby \LaTeX{} not only reads the helper
-file with the contents of the directory, but opens the helper file for writing
-also. Nevertheless, if afterwards new entries to these lists of floats will be
-made using \Macro{addcontentsline}, then this will not write immediately to
-the helper file. Instead of \LaTeX{} writes
+To allocate a new file handle eg. for \Macro{listoffigures} or
+\Macro{listoftables} \LaTeX{} classes use the \LaTeX{} kernel command
+\Macro{@starttoc}\IndexCmd{@starttoc}. This command not only inputs the
+associated helper file but also allocates a new write handle for the
+associated helper file and opens it for writing. Nevertheless, if afterwards
+new entries to these lists of floats are added using \Macro{addcontentsline},
+then these file handles are not used immediately, instead \LaTeX{} writes
\Macro{@writefile}\IndexCmd{@writefile} commands into the
\File{aux}-file. Only while reading the \File{aux}-file while the end of the
-document, those \Macro{@writefile} commands generates real write operations
-into the helper files. \LaTeX{} even doesn't close the helper files
-explicitly. Instead of \LaTeX{} counts on \TeX{} to close all open files at
+document, those \Macro{@writefile} commands become real write operations
+on the helper files. Additionally \LaTeX{} does not close the helper files
+explicitly. Instead \LaTeX{} relies on \TeX{} to close all open files at
the end.
-This procedure means, that all the helper files are open for writing from the
-output of the contents, i.\,e. at the front matter of the document until the
-end of the document, though their content is written after the end of the
-document. \Package{scrwfile}'s basic approach is exactly this: redefinition of
+Thus all the helper files are open throughout the entire process. However the
+content is written at \Macro{end}\PParameter{document}. The basic idea of
+\Package{scrwfile} is tackling this contradiction by redefining
\Macro{@starttoc} and \Macro{@writefile}.
-Surely\textnote{Attention!}, changes of the \LaTeX{} kernel always may
-potentially result in incompatibilities with other packages. In case of
-\Package{scrwfile} this may be happen with all packages, that redefine
-\Macro{@starttoc} or \Macro{@writefile} too. Sometimes changing the order of
+Surely\textnote{Attention!}, changes of the \LaTeX{} kernel may
+result in incompatibilities with other packages. In case of
+\Package{scrwfile}, clashes my arise with all packages also redefining
+\Macro{@starttoc} or \Macro{@writefile}. Sometimes changing the order of
loading the packages may help.
-In fact, such problems with \Package{scrwfile} haven't been reported currently,
-though several users have tested the package for more than a year until first
-release. Nevertheless, if you find such a problem, please contact the
+However, only few such problems have been reported eventhough several users
+have tested the package for one year before its first release. See
+\autoref{sec:scrwfile.incompatible} for more information about known
+incompatibilities. If you find such a problem, please contact the
\KOMAScript{} author.
\section{The Single File Feature}
\label{sec:scrwfile.singlefilefeature}
-Just while loading the package using, e.\,g.,
+At the point the package is loaded using, e.\,g.,
\begin{lstcode}[belowskip=\dp\strutbox]
\usepackage{scrwfile}
\end{lstcode}
\Package{scrwfile} will redefine \Macro{@starttoc}\IndexCmd{@starttoc} to not
-longer allocate a file handle or open any file for writing. Immediately before
+longer allocate a write handle or open any file for writing. Immediately before
closing the \File{aux}-file in \Macro{end}\PParameter{document} it will
-redefine \Macro{@writefile} to not longer write into the usual helper files
+redefine \Macro{@writefile} to no longer write into the usual helper files
but into one single new file with file extension \File{wrt}. After
reading the \File{aux}-file this \File{wrt}-file will be processed once per
helper file. This means, that not all of the helper file have to be open at
@@ -131,22 +135,22 @@ afterwards and the write handle is not longer needed after it is closed. An
internal write handle of \LaTeX{} is used for this. So \Package{scrwfile}
doesn't need any own write handle.
-Because of this, even if only one table of contents should be generated, after
-loading \Package{scrwfile} one more write file handle will be available,
+Because of this, even if only one table of contents should be generated,
+loading \Package{scrwfile} gives one extra write file handle,
e.\,g., for bibliographies, indexes, glossaries and similar, that are not
using \Macro{@starttoc}. Additionally the number of tables of contents and
-lists of whatever, that use \Macro{@starttoc}\IndexCmd{@starttoc} won't be
+lists of whatever, that use \Macro{@starttoc}\IndexCmd{@starttoc} is not
limited any longer.
\section{The Clone File Write Feature}
\label{sec:scrwfile.clonefilefeature}
Sometimes it is useful to input a file not only once but several times. As
-\Macro{@starttoc} does not open files for writing any longer, this may be
-done by simply using \Macro{@starttoc} several times with the same
-extension. But sometimes you may have additional entries in only some of the
-content directories. Because of this, \Package{scrwfile} allows to copy all
-entries of a file to another file, too. We call this cloning.
+\Macro{@starttoc} does not open files for writing any more, this can be done
+by simply using \Macro{@starttoc} several times with the same extension. But
+sometimes you may have additional entries in only some of the content
+directories. \Package{scrwfile} allows to copy all entries of a file to
+another file, too. We call this cloning.
\begin{Declaration}
\Macro{TOCclone}%
@@ -156,7 +160,7 @@ entries of a file to another file, too. We call this cloning.
activates the clone feature for files with extensions \PName{source} and
\PName{destination}. All entries to the file
\Macro{jobname}\File{.}\PName{source} will be added to
-\Macro{jobname}\File{.}\PName{destination}, too.
+\Macro{jobname}\File{.}\PName{destination}.
If extension \PName{destination} is a new one, \PName{destination} will be
added to the list of known extensions using the \KOMAScript{} package
@@ -169,7 +173,7 @@ as section (or chapter) heading of this list. In this case several
\PName{destination}, if and only if they have been set up when
\Macro{TOCclone} was used. Feature \PName{nobabel} will always be set,
because the language selection commands are part of the helper file and
-would be cloned, too.
+would be cloned, anyway.
\begin{Example}
Assumed, you want a short table of contents
@@ -179,8 +183,8 @@ contents:
\usepackage{scrwfile}
\TOCclone[Short \contentsname]{toc}{stoc}
\end{lstcode}
-This would create a new table of contents with the heading ^^c2^^bbShort
-Contents^^c2^^ab. The new table of contents uses a helper file with extension
+This would create a new table of contents with the heading ``Short
+Contents''. The new table of contents uses a helper file with extension
\File{stoc}. All entries to the helper file with extension \File{toc} will
also be copied to this new helper file.
@@ -191,9 +195,9 @@ be done using:
\end{lstcode}
Normally you cannot write into a helper file before
\Macro{begin}\PParameter{document}. But using \Package{scrwfile} changes
-this. So the code above will be successful after loading \Package{scrwfile}.
+this. So the code above is correct already after loading \Package{scrwfile}.
-To show the new short contents of helper file extension \File{stoc} we will
+To show the new short contents of helper file extension \File{stoc} we
use
\begin{lstcode}[moretexcs={listofsttoc}]
\listofstoc
@@ -219,7 +223,7 @@ too. So we cannot add the command to the \File{toc}-file. Package
{\protect\contentsname}%
}
\end{lstcode}
-But this needs, that the file with extension \File{toc} is under control of
+However, this needs, that the file with extension \File{toc} is under control of
package \Package{tocbasic}, which is indeed the case within all \KOMAScript{}
classes.
See \autoref{sec:tocbasic.toc} on
@@ -228,19 +232,40 @@ See \autoref{sec:tocbasic.toc} on
\end{Example}
\EndIndex{Cmd}{TOCclone}
-\section{State of Development Note}
+\section{Note on State of Development}
\label{sec:scrwfile.draft}
-Though this package has been tested by several users and even is in
-productivity usage several times, development is not finished yet. Because of
-this especially internal functionality may be changed in future. Most likely
+Eventhough this package has been tested by several users and even is in
+productivity usage several times it is still under construction. Therefore,
+there might be amendments especially to the internal functionality. Most likely
the package will be extended. Some code for extensions is already in the
-package. Nevertheless, currently user haven't make requests for such
-extension. So there's currently no user documentation for this.
+package. However, there is currently no user documentation available, as up to
+now nobody has requested any of these extensions.
+
+\section{Known Package Incompatibilities}
+\label{sec:scrwfile.incompatible}
+
+As mentioned in \autoref{sec:scrwfile.kernelpatches},
+\Package{scrwfile} redefines some commands of the \LaTeX{} kernel. This
+happens not only while loading the package, but indeed at different times of
+processing a document, e.\,g., just before reading the
+\File{aux}-file. This\textnote{Attention!} results in incompatibility with
+packages that also redefine these commands at run-time.
+
+The \Package{titletoc}\important{Package{titletoc}}\IndexPackage{titletoc}
+package is an example for such an incompatibility. That
+package redefines \Macro{@writefile} under some conditions at run-time. If you
+use both, \Package{scrwfile} and \Package{titletoc}, there is no warranty for
+the correct behaviour of neither of them. This is neither an error of
+\Package{titletoc} nor of \Package{scrwfile}.
\EndIndex{Package}{scrwfile}
-\endinput
-%%
-%% End of file `scrwfile.tex'.
+%%% Local Variables:
+%%% mode: latex
+%%% mode: flyspell
+%%% coding: us-ascii
+%%% ispell-local-dictionary: "en_GB"
+%%% TeX-master: "../guide"
+%%% End:
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 3e240f8f973..7c509127f88 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
@@ -16,7 +16,7 @@
%%
%% tocbasic.dtx (with options: `doc')
%%
-%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -48,9 +48,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
\ProvidesFile{tocbasic.tex}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package
(handling toc-files)%
]
@@ -73,11 +73,11 @@
The main purpose of package \Package{tocbasic} is to provide features for
authors of classes and packages to create own tables or lists of contents like
the list of figures and the list of tables and thereby allow other classes or
-packages some types of controll about these. For examples package
+packages some types of control over these. For examples package
\Package{tocbasic} delegates language control of all these tables and lists of
contents to package \Package{babel}\IndexPackage{babel}%^^A
\ (see \cite{package:babel})%^^A
-. So automatic change of language will be provides inside
+. So automatic change of language will be provided inside
all these tables and lists of contents. Using \Package{tocbasic} will
exculpate authors of classes and packages from implementation of such
features.
@@ -90,12 +90,12 @@ contents but also for the already mentioned lists of figures and tables.
Basic commands are used to handle a list of all extensions\textnote{file
extension, table or list of contents} known for files representing a table
-of contents or list of something. Entries to such files are written using
-\Macro{addtocontents}\important{\Macro{addtocontents},
- \Macro{addcontentsline}} or \Macro{addcontentsline} typically. There are
-also commands to do something for all known extensions. And there are
-commands to set or unset features of an extension or the file represented by
-the extension. Typically an extension also has an owner\textnote{file owner}.
+of contents or list of something. Entries to such files are typically written
+using \Macro{addtocontents}\important{\Macro{addtocontents},
+ \Macro{addcontentsline}} or \Macro{addcontentsline}. There are also
+commands to do something for all known extensions. And there are commands to
+set or unset features of an extension or the file represented by the
+extension. Typically an extension also has an owner\textnote{file owner}.
This owner may be a class or package or a term decided by the author of the
class or package using \Package{tocbasic}, e.\,g., \KOMAScript{} uses the
owner \texttt{float} for list of figures and list of tables, and the file name
@@ -107,7 +107,7 @@ of the class file as owner for the table of contents.
\end{Declaration}
\BeginIndex{Cmd}{ifattoclist}%
This command
-may be used to ask, wether or not a \PName{extension} is already a known
+may be used to ask, wether or not an \PName{extension} is already a known
extension. If the \PName{extension} is already known the \PName{true
instructions} will be used, otherwise the \PName{false instructions} will be
used.
@@ -160,7 +160,7 @@ result in an empty owner.
\addtotoclist{foo}
\end{lstcode}%
This will add the extension ``\PValue{foo}'' with owner ``\PValue{bar.sty}''
- to the list of known extensions, if it was not already at the list of known
+ to the list of known extensions, if it was not already on the list of known
extensions. If the class or another package already added the extension you
will get the error:
\begin{lstoutput}
@@ -178,7 +178,7 @@ result in an empty owner.
or a mistake by the user.
\end{lstoutput}
- Maybe you package has a command, that creates list of files dynamically. In
+ Maybe your package has a command, that creates list of files dynamically. In
this case you should use the optional argument of \Macro{addtotoclist} to
set the owner.
\begin{lstcode}
@@ -198,12 +198,12 @@ result in an empty owner.
You may use any owner you want. But it should be unique! So, if you would
be, e.\,g., the author of package \Package{float} you could use for example
owner ``\PValue{float}'' instead of owner ``\PValue{float.sty}'', so the
-\KOMAScript{} options for list of figure and list of table will also handle
-the lists of this package, that are already added to the known extensions,
-when the option is used. This is because \KOMAScript{} already registers file
-extension ``\PValue{lof}'' for the list of figures and file extension
-``\PValue{lot}'' for the list of tables with owner ``\PValue{float}'' and sets
-options for this owner.
+\KOMAScript{} options for the list of figures and the list of tables will also
+handle the lists of this package. Those are already added to the known
+extensions when the option is used. This is because \KOMAScript{} already
+registers file extension ``\PValue{lof}'' for the list of figures and file
+extension ``\PValue{lot}'' for the list of tables with owner
+``\PValue{float}'' and sets options for this owner.
\EndIndex{Cmd}{addtotoclist}%
\begin{Declaration}
@@ -211,10 +211,10 @@ options for this owner.
\end{Declaration}
\BeginIndex{Cmd}{AtAddToTocList}%
This command
-adds the \PName{instructions} to a internal list of instructions, that will be
-processed, whenever a file extension with the given \PName{owner} will be
+adds the \PName{instructions} to a internal list of instructions that will be
+processed whenever a file extension with the given \PName{owner} will be
added to the list of known extensions using \Macro{addtotoclist}. The
-optional argument is handled in the same kind as with command
+optional argument is handled in the same way as with the command
\Macro{addtotoclist}. With an empty \PName{owner} you may
add \Parameter{instructions}, that will be processed at every successful
\Macro{addtotoclist}, after processing the instructions for the individual
@@ -246,8 +246,8 @@ for more information.
\BeginIndex{Cmd}{removefromtoclist}%
This command
removes the \PName{extension} from the list of known extensions. If the
-optional argument, \OParameter{owner}, was given the \PName{extension} will
-only be removed, if it was added by this \PName{owner}. See description of
+optional argument, \OParameter{owner}, was given, the \PName{extension} will
+only be removed if it was added by this \PName{owner}. See description of
\Macro{addtotoclist} for information of omitting optional argument. Note that
an empty \PName{owner} is not the same like omitting the optional argument,
but removes the \PName{extension} without any owner test.%
@@ -257,10 +257,10 @@ but removes the \PName{extension} without any owner test.%
\Macro{doforeachtocfile}\OParameter{owner}\Parameter{instructions}
\end{Declaration}
\BeginIndex{Cmd}{doforeachtocfile}%
-Until now you've learned to know commands, that result in more safety in
+Until now you've learned to know commands that result in more safety in
handling file extensions, but also needs some additional effort. With
\Macro{doforeachtocfile}%^^A
-you'll win for this. The command provides to processes \PName{instructions}
+\ you will win for this. The command provides to processes \PName{instructions}
for every known file extension of the given \PName{owner}. While processing
the \PName{instructions} \Macro{@currext} is the extension of the current
file. If you omit the optional argument, \OParameter{owner}, every known file
@@ -289,22 +289,22 @@ instead of \Macro{@starttoc}. See \autoref{sec:tocbasic.internals}%^^A
, \autopageref{desc:tocbasic.cmd.tocbasic@starttoc}
for more information about \Macro{tocbasic@starttoc} and \Macro{@starttoc}.
-This means, that after using \Macro{tocbasicautomode} every table of contents
+This means that after using \Macro{tocbasicautomode} every table of contents
or list of something, that will be generated using \Macro{@starttoc} will be
-at least partial under control of \Package{tocbasic}. Whether or not this will
+at least partially under control of \Package{tocbasic}. Whether or not this will
make the wanted result, depends on the individual table of contents and lists
of something. At least the \Package{babel} control extension for
all those tables of contents and lists of something will work. Nevertheless,
-it would be better, if the author of the corresponding class or package will
+it would be better if the author of the corresponding class or package will
use \Package{tocbasic} explicitly. In that case additional advantages of
-\Package{tocbasic} may be used, that will be described at the following
+\Package{tocbasic} may be used that will be described at the following
sections.%
\EndIndex{Cmd}{tocbasicautomode}%
\section{Creating a Table of Contents or List of Something}
\label{sec:tocbasic.toc}
-At the previous section you've seen commands to handle a list of known
+In the previous section you've seen commands to handle a list of known
extensions and to trigger commands while adding a new extension to this
list. You've also seen a command to do something for all known extensions or
all known extensions of one owner. In this section you will see commands to
@@ -318,8 +318,8 @@ extensions.
This command
writes \PName{content} to the files of every known file extension of
\PName{owner} using \LaTeX{} kernel command \Macro{addtocontents}. If you omit
-the optional argument, \PName{content} it written to the files of every known
-file extension. Bay the way: The practical file name is build from
+the optional argument, \PName{content} is written to the files of every known
+file extension. Furthermore, the practical file name is built from
\Macro{jobname} and the file extension. While writing the \PName{content},
\Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} is the
extension of the currently handled file.
@@ -573,7 +573,7 @@ head if wanted. The default is, to use
without change of case.
\Macro{MakeUppercase}\IndexCmd{MakeUppercase}\important{\Macro{MakeUppercase}}
will be used for all other classes. If you are the class author you may define
-\Macro{MakeMarkcase} on your own. If \Package{scrpage2} or another package,
+\Macro{MakeMarkcase} on your own. If \Package{scrlayer} or another package,
that defines \Macro{MakeMarkcase} will be used, \Package{tocbasic} will not
overwrite that definition.
\begin{Example}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/typearea-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/typearea-experts.tex
index 7a2d45bc612..a9fff809493 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/typearea-experts.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/typearea-experts.tex
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{typearea-experts.tex}
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2013-12-13 12:11:01 +0100 (Fri, 13 Dec 2013) $
KOMA-Script guide (chapter: typearea)]
\translator{Markus Kohm\and Gernot Hassenpflug}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex
index a752145682b..a1363a320aa 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex
@@ -1,6 +1,6 @@
% ======================================================================
% typearea.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% 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-2013
+% Copyright (c) Markus Kohm, 2001-2014
%
% 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.tex}%
- [$Date: 2013-12-13 12:11:01 +0100 (Fr, 13. Dez 2013) $
+ [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $
KOMA-Script guide (chapter: typearea)]
\translator{Markus Kohm\and Gernot Hassenpflug\and Krickette Murabayashi}
-% Date of translated german file: 2013/11/21
+% Date of translated german file: 2014/06/25
\chapter{Construction of the Page Layout with \Package{typearea}}
\labelbase{typearea}
@@ -480,7 +480,8 @@ the minor conditions dependent on font size are not considered.
\begin{table}
\centering
- \caption{Type area dimensions dependent on \Var{DIV} for A4}
+ \caption[{Type area dimensions dependent on \Var{DIV} for A4}]{Type area
+ dimensions dependent on \Var{DIV} for A4 regardless of \Length{topskip}}
\begin{tabular}{ccccc}
\toprule
&
@@ -491,16 +492,16 @@ the minor conditions dependent on font size are not considered.
&
width [mm] & height [mm] & top [mm] & inner [mm] \\
\midrule
- 6 & 105,00 & 148,50 & 49,50 & 35,00 \\
- 7 & 120,00 & 169,71 & 42,43 & 30,00 \\
- 8 & 131,25 & 185,63 & 37,13 & 26,25 \\
- 9 & 140,00 & 198,00 & 33,00 & 23,33 \\
- 10 & 147,00 & 207,90 & 29,70 & 21,00 \\
- 11 & 152,73 & 216,00 & 27,00 & 19,09 \\
- 12 & 157,50 & 222,75 & 24,75 & 17,50 \\
- 13 & 161,54 & 228,46 & 22,85 & 16,15 \\
- 14 & 165,00 & 233,36 & 21,21 & 15,00 \\
- 15 & 168,00 & 237,60 & 19,80 & 14,00 \\
+ 6 & 105.00 & 148.50 & 49.50 & 35.00 \\
+ 7 & 120.00 & 169.71 & 42.43 & 30.00 \\
+ 8 & 131.25 & 185.63 & 37.13 & 26.25 \\
+ 9 & 140.00 & 198.00 & 33.00 & 23.33 \\
+ 10 & 147.00 & 207.90 & 29.70 & 21.00 \\
+ 11 & 152.73 & 216.00 & 27.00 & 19.09 \\
+ 12 & 157.50 & 222.75 & 24.75 & 17.50 \\
+ 13 & 161.54 & 228.46 & 22.85 & 16.15 \\
+ 14 & 165.00 & 233.36 & 21.21 & 15.00 \\
+ 15 & 168.00 & 237.60 & 19.80 & 14.00 \\
\bottomrule
\end{tabular}
\label{tab:typearea.typearea}
@@ -775,7 +776,7 @@ page should be reset to the normal value.
\end{lstcode}
See further also the notes in \autoref{sec:typearea.tips}. The command
\Macro{AfterTOCHead}\IndexCmd{AfterTOCHead} will be described in
- \autoref{cha:tocbasic} of \autoref{part:forExoerts} on
+ \autoref{cha:tocbasic} of \autoref{part:forExperts} on
\autopageref{desc:tocbasic.cmd.AfterTOCHead}.
\end{Example}
@@ -1043,7 +1044,7 @@ the above explanations. Default is usually
\OptionValue{headinclude}{false} and \OptionValue{footinclude}{false},
but this can change depending on {\KOMAScript} class and {\KOMAScript}
packages used (see \autoref{sec:maincls.options} and
-\autoref{cha:scrpage}).
+\autoref{cha:scrlayer-scrpage}).
Please note that when using these options with one of the
{\KOMAScript} classes as in the example above, they must be used
@@ -1171,7 +1172,7 @@ directly as a class option:
\documentclass[a4paper,headlines=2.1]{scrartcl}
\end{lstcode}
Commands that can be used to define the contents of a header with two lines
-are described in \autoref{cha:scrpage} and \autoref{cha:scrlayer-scrpage}.
+are described in \autoref{cha:scrlayer-scrpage}.
\end{Example}
In some cases it is useful to be able to specify the header height not