summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/doc/english
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/doc/english')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-21.tex259
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/common-5.tex139
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex5
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex19
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex74
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage-experts.tex28
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer-scrpage.tex10
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex76
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex2
9 files changed, 503 insertions, 109 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-21.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-21.tex
index 92397fe2f17..822bf997d91 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-21.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-21.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-21.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2015
%
% 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-21.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2015
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -51,11 +51,12 @@
Manipulation of defined page styles)]
\translator{Markus Kohm\and Jana Schubert}
-% Date version of the translated file: 2013-10-23
+% Date version of the translated file: 2015-01-28
\makeatletter
\@ifundefined{ifCommonscrlayer}{\newif\ifCommonscrlayer}{}%
-\@ifundefined{ifCommoonscrlayer-scrpage}{\expandafter\newif\csname ifCommonscrlayer-scrpage\endcsname}{}%
+\@ifundefined{ifCommonscrlayerscrpage}{\newif\ifCommonscrlayerscrpage}{}%
+\@ifundefined{ifCommonscrlayerscrpageexperts}{\newif\ifCommonscrlayerscrpageexperts}{}
\@ifundefined{ifIgnoreThis}{\newif\ifIgnoreThis}{}%
\makeatother
@@ -84,9 +85,15 @@
\Package{scrlayer-scrpage}.%
}
+\IfCommon{scrlayer-scrpage-expert}{%
+ This section is an add-on to \autoref{sec:scrlayer.pagestyle.content}. It
+ describes features that may be to complicated for beginners.%
+}
+
+\ifCommonscrlayerscrpageexperts\else % ------- nicht scrlayer-scrpage-experts -
\ifshortversion\IgnoreThistrue\IfCommon{scrlayer-scrpage}{\IgnoreThisfalse}\fi
-\ifIgnoreThis %++++++++++++++++++++++++++++++++++++++++ not scrlayer-scrpage +
-\else %----------------------------------------------- only scrlayer-scrpage -
+\ifIgnoreThis %++++++++++++++++++++++++++++++++++++++ nicht scrlayer-scrpage +
+\else %------------------------------------------------ nur scrlayer-scrpage -
\begin{Declaration}
\Macro{automark}\OParameter{section level of the right mark}%
@@ -103,44 +110,54 @@
\BeginIndex{Option}{automark}%
\BeginIndex{Option}{manualmark}%
\BeginIndex{Option}{autooneside~=\PName{simple switch}}%
-With the \LaTeX{} standard classes or the \KOMAScript{} classes the decision
-whether using automatic running heads\Index{running heads>automatic}, or
-static or manual running heads\Index{running heads>static}\Index{running
- heads>manual} would be done using either page style \Pagestyle{headings} or
-\Pagestyle{myheadings}. Automatic running heads are replications of a
-significant, characterizing text snippet of the page mostly inside the page
-head, sometimes in the page footer.
-
-The article classes\OnlyAt{\Class{article}\and \Class{scrartcl}}
-\Class{article} or \Class{scrartcl} with page style
-\Pagestyle{headings}\IndexPagestyle{headings} use the section heading, which
-is either the mandatory or the optional argument of \Macro{section}, for the
-automatic running head of single side documents. Double side documents use
-this section heading as the \emph{left mark} and at once use the subsection
-heading as the \emph{right mark}. The left mark will be printed on left pages,
-which founds the name \emph{left mark}. The right mark will be printed on
-right\,---\,in single side mode this means every\,---\,page. The classes by
-default also remove the right mark whenever they put the section heading into
-the left mark.
-
-The report and book classes \OnlyAt{\Class{report}\and
- \Class{scrreprt}\and \Class{book}\and \Class{scrbook}} start one level
-higher. So they use the chapter heading to be the right mark in single side
-layout. In double side layout they use the chapter heading to be the left mark
-and the section heading to be the right mark.
-
-If you are using \Pagestyle{myheadings} instead of
-\Pagestyle{headings}\IndexPagestyle{myheadings}, the marks in the page header
-still exists and would be printed same like using \Pagestyle{headings}. But
-section commands will not automatically set the marks any longer. So you can
-fill them only using the commands \Macro{markright}, \Macro{markleft}, and
-\Macro{markboth}, which will be described later in this section.
-
-This difference between two page styles has been abolished by
+\IfCommon{scrlayer-scrpage}{%
+ \begin{Explain}
+ With the \LaTeX{} standard classes or the \KOMAScript{} classes the
+ decision whether using automatic running heads\Index{running
+ heads>automatic}, or static or manual running heads\Index{running
+ heads>static}\Index{running heads>manual} would be done using either
+ page style \Pagestyle{headings} or \Pagestyle{myheadings}. Automatic
+ running heads are replications of a significant, characterizing text
+ snippet of the page mostly inside the page head, sometimes in the page
+ footer.
+
+ The article classes\OnlyAt{\Class{article}\and \Class{scrartcl}}
+ \Class{article} or \Class{scrartcl} with page style
+ \Pagestyle{headings}\IndexPagestyle{headings} use the section heading,
+ which is either the mandatory or the optional argument of \Macro{section},
+ for the automatic running head of single side documents. Double side
+ documents use this section heading as the \emph{left mark} and at once use
+ the subsection heading as the \emph{right mark}. The left mark will be
+ printed on left pages, which founds the name \emph{left mark}. The right
+ mark will be printed on right\,---\,in single side mode this means
+ every\,---\,page. The classes by default also remove the right mark
+ whenever they put the section heading into the left mark.
+
+ The report and book classes \OnlyAt{\Class{report}\and
+ \Class{scrreprt}\and \Class{book}\and \Class{scrbook}} start one level
+ higher. So they use the chapter heading to be the right mark in single
+ side layout. In double side layout they use the chapter heading to be the
+ left mark and the section heading to be the right mark.
+
+ If you are using \Pagestyle{myheadings} instead of
+ \Pagestyle{headings}\IndexPagestyle{myheadings}, the marks in the page
+ header still exists and would be printed same like using
+ \Pagestyle{headings}. But section commands will not automatically set the
+ marks any longer. So you can fill them only using the commands
+ \Macro{markright}, \Macro{markleft}, and \Macro{markboth}, which will be
+ described later in this section.
+ \end{Explain}\par
+}
+\IfNotCommon{scrlayer-scrpage}{In common classes the decision for a page
+ style\,---\,generally \Pagestyle{headings} and
+ \Pagestyle{myheading}\,---\,is also a decision to use either automatic or
+ manual running heads.}
+This difference between those two page styles has been abolished by
\Package{scrpage2} and also by \Package{scrlayer}. Instead of distinguishing
between automatic and manual running head by the selection of a page style,
-two new commands, \Macro{automark} and \Macro{manualmark}, are provided. The
-command \Macro{manualmark} switches to manual marks and deactivates the
+two new commands, \Macro{automark} and \Macro{manualmark}, are provided.
+
+The command \Macro{manualmark} switches to manual marks and deactivates the
automatic filling of the marks. In contrast to this \Macro{automark} and
\Macro{automark*} can be used to define, which section levels should be used
for the automatic mark filling. The optional argument is the \PName{section
@@ -158,6 +175,7 @@ The difference in \Macro{automark} and \Macro{automark*} is, that
\Macro{automark*}, while \Macro{automark*} changes only the behaviour of the
section levels of its arguments. So you can even build more complex cases.
+\ifCommonscrlayerscrpage% +++++++++++++++++++++++++++ nur scrlayer-scrpage +
\begin{Example}
Assume you want the chapter heading to be the running head of even pages
and the section heading to be the running head of odd pages like this is
@@ -206,6 +224,7 @@ section levels of its arguments. So you can even build more complex cases.
this page to the end the running head alternates between chapter and section
heading from page to page.
\end{Example}
+\fi % ******************************************** Ende nur scrlayer-scrpage *
Instead of the commands you may also use the options \Option{manualmark} and
\Option{automark} to switch between manual and automatic running
@@ -228,7 +247,7 @@ found in \autoref{tab:truefalseswitch} on
\autopageref{tab:truefalseswitch}. If you'd deactivate the option, in single
side layout the optional and the obligatory arguments of \Macro{automark} and
\Macro{automark*} will influence the running head again.%
-%
+\ifCommonscrlayerscrpage% +++++++++++++++++++++++++++++ nur scrlayer-scrpage +
\begin{Example}
Assume you have a single sided report but want similar running heads as in
the book example before. The chapter headings should be used as a running
@@ -253,6 +272,7 @@ side layout the optional and the obligatory arguments of \Macro{automark} and
\PValue{true} or remove the option and its value. You should find a
difference at the running head in the pages' head from page~4 on.
\end{Example}
+\fi% ********************************************* Ende nur scrlayer-scrpage *
Please note\textnote{Attention!}, only loading the package does not have
any effect on the fact whether automatic or manual running heads are used or
@@ -334,8 +354,9 @@ used. This will also deactivate \Macro{MakeUppercase} and \Macro{uppercase}
inside the running heads.
You can find all valid values for \Option{markcase} in
-\autoref{tab:scrlayer-scrpage.markcase}.%
-%
+\autoref{tab:scrlayer-scrpage.markcase}\IfNotCommon{scrlayer-scrpage}{,
+ \autopageref{tab:scrlayer-scrpage.markcase}}.%
+\ifCommonscrlayerscrpage
\begin{table}
\centering
\caption[Possible values for option \Option{markcase}]{Possible values for
@@ -366,7 +387,7 @@ You can find all valid values for \Option{markcase} in
}%
\end{desctabular}
\end{table}
-%
+\fi
\EndIndex{Option}{markcase~=\PName{Wert}}%
\begin{Declaration}
@@ -401,9 +422,10 @@ the output. This can be changed using command \Macro{setkomafont} or
\Macro{addtokomafont} (see also \autoref{sec:maincls.textmarkup},
\autopageref{desc:maincls.cmd.setkomafont}).%
\EndIndex{FontElement}{pagenumber}%
-%
+\ifCommonscrlayerscrpage% +++++++++++++++++++++++++++++ nur scrlayer-scrpage +
\begin{Example}
- Assume you want to use a left aligned running head and right aligned page
+ Assume\label{example.scrlayer-scrpage.headmark} you want to use a left
+ aligned running head and right aligned page
number in the head of the pages of a document in single side layout. The
following minimal but working examples would do so:
\begin{lstcode}
@@ -440,7 +462,24 @@ Please note\textnote{Attention!}, that the empty optional argument of
\Macro{cfoot} in the example above is not the same like omitting the optional
argument. Please try it out and have a look at the difference in the footer of
the first page.%
-%
+\else % --------------------------------------------- nicht scrlayer-scrpage -
+ \par %
+ If you are interested in an example about usage of commands \Macro{headmark}
+ and \Macro{pagemark}, have a look into
+ \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{example.scrlayer-scrpage.headmark}. The package
+ \Package{scrlayer-scrpage} internally uses a lot of such features of
+ \Package{scrlayer}.%
+\fi% ******************************************* Ende nicht scrlayer-scrpage *
+\ifnum\currentversionlt{3.16}\else\par
+ If all the mark features described above are not sufficient, experienced
+ users can find more of them on \IfCommon{scrlayer-scrpage}{%
+ \autopageref{desc:scrlayer-scrpage-experts.cmd.righttopmark}}%
+ \IfNotCommon{scrlayer-scrpage}{%
+ \autopageref{desc:scrlayer.cmd.righttopmark}}. For example, you can find
+ there \Macro{leftfirstmark} and \Macro{rightbotmark}, which seem to be
+ useful for lexicon like documents.%
+\fi
\EndIndex{Cmd}{pagemark}%
\EndIndex{Cmd}{headmark}%
\EndIndex{Cmd}{rightmark}%
@@ -467,7 +506,7 @@ commands internally to bring the section numbers into wanted form and
additionally they support the \Macro{autodot} mechanism of the \KOMAScript{}
classes. If wanted these commands may be redefined to get another form of
section numbers.%
-%
+\ifCommonscrlayerscrpage% ++++++++++++++++++++++++++++ nur scrlayer-scrpage +
\begin{Example}
Assume you do not want section numbers but section heading text only in the
running head. So:
@@ -476,6 +515,12 @@ section numbers.%
\end{lstcode}
would be a simple solution for this.
\end{Example}
+\else % -------------------------------------------- nicht scrlayer-scrpage -
+ \ See the example in
+ \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{example:scrlayer-scrpage.sectionmarkformat} for more
+ information.%
+\fi % ***************************************** Ende nicht scrlayer-scrpage *
%
\EndIndex{Cmd}{subparagraphmarkformat}%
\EndIndex{Cmd}{paragraphmarkformat}%
@@ -550,7 +595,7 @@ depending on the configuration of the automatism.
You may also use these commands together with the star versions of the section
commands.%
-%
+\ifCommonscrlayerscrpage % +++++++++++++++++++++++++++++ nur scrlayer-scrpage +
\begin{Example}
Assume you are using a preface with several pages just before the table of
contents, that should not have an entry at the table of contents
@@ -609,18 +654,26 @@ commands.%
\end{document}
\end{lstcode}
\end{Example}
+\else % -------------------------------------------- nicht scrlayer-scrpage -
+ \ You can find a detailed example about usage of \Macro{markboth} with
+ \Package{scrlayer-scrpage} in
+ \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{example:scrlayer-scrpage.markboth}. Package
+ \Package{scrlayer-scrpage} is a kind of extension of \Package{scrlayer}.%
+\fi % ***************************************** Ende nicht scrlayer-scrpage *
%
\EndIndex{Cmd}{markboth}%
\EndIndex{Cmd}{markright}%
\EndIndex{Cmd}{markleft}%
\fi %********************************************* End only scrlayer-scrpage *
+\fi %*********************************** Ende nicht scrlayer-scrpage-experts *
-\ifshortversion\IgnoreThistrue\IfCommon{scrlayer}{\IgnoreThisfalse}\fi
-\ifIgnoreThis %++++++++++++++++++++++++++++++++++++++++++++++++ not scrlayer +
-\else %------------------------------------------------------- only scrlayer -
-
+\ifshortversion\IgnoreThisfalse\IfCommon{scrlayer-scrpage}{\IgnoreThistrue}\fi
+\ifIgnoreThis %+++++++++++++++++++++++++++++++++++++++ auch scrlayer-scrpage +
+\else %---------------------------------------------- nicht scrlayer-scrpage -
+\ifCommonscrlayerscrpage\else %---------------------- nicht scrlayer-scrpage -
\begin{Declaration}
\Macro{GenericMarkFormat}\Parameter{name of the section level}
\end{Declaration}
@@ -639,7 +692,7 @@ kernel. The expected, mandatory argument of the command is the \PName{name of
You can change the default formatting of the numbers, that use this command,
by redefining only this single command. Classes can change the default
formatting also by defining this command.%
-%
+\ifCommonscrlayerscrpageexperts % ++++++++++++ nur scrlayer-scrpage-experts +
\begin{Example}
Assume you want the section numbers of all levels at the running head of
an article to be printed in white colour inside a black coloured box. Using
@@ -700,9 +753,98 @@ formatting also by defining this command.%
\end{document}
\end{lstcode}
\end{Example}
+\else % ------------------------------------- nicht scrlayer-scrpage-experts -
+ \par %
+ A detailed example about cooperation of command \Macro{GenericMarkFormat}
+ and the commands \Macro{sectionmarkformat} and \Macro{subsectionmarkformat}
+ that are described at \autopageref{desc:\csname
+ label@base\endcsname.cmd.chaptermark} is shown in
+ \autoref{sec:scrlayer-scrpage-experts.pagestyle.content},
+ \autopageref{example:scrlayer-scrpage-experts.GenericMarkFormat}.%
+\fi % ********************************** Ende nicht scrlayer-scrpage-experts *
%
\EndIndex{Cmd}{GenericMarkFormat}%
+\ifnum\currentversionlt{3.16}\else
+\begin{Declaration}
+ \Macro{righttopmark}\\
+ \Macro{rightbotmark}\\
+ \Macro{rightfirstmark}\\
+ \Macro{lefttopmark}\\
+ \Macro{leftbotmark}\\
+ \Macro{leftfirstmark}
+\end{Declaration}
+\BeginIndex{Cmd}{righttopmark}%
+\BeginIndex{Cmd}{rightbotmark}%
+\BeginIndex{Cmd}{rightfirstmark}%
+\BeginIndex{Cmd}{lefttopmark}%
+\BeginIndex{Cmd}{leftbotmark}%
+\BeginIndex{Cmd}{leftfirstmark}%
+For page styles \LaTeX\ChangedAt{v3.16}{\Package{scrlayer}} uses a bipartite
+\TeX{} mark. Running heads can use the left part of that mark by
+\Macro{leftmark}\important{\Macro{leftmark}}\IndexCmd{leftmark} and the right
+part by
+\Macro{rightmark}\important{\Macro{rightmark}}\IndexCmd{rightmark}. Indeed, it
+seems that it was suggested to use \Macro{leftmark} for the running head of
+left, even pages and \Macro{rightmark} for the running head of right, odd
+pages of double-sided documents. Within single-sided layouts the standard
+classes even do not set the left part of the mark.
+
+\TeX{} itself knows three alternatives to make usage of a mark. The
+\Macro{botmark} is the last valid mark of the page that has been build
+last. If there has not been set any mark on the page, it is the last mark of the
+already shipped out pages. \LaTeX{} command \Macro{leftmark} uses exactly this
+mark. So it shows the left part of the last mark of the page. This is the same
+like \Macro{leftbotmark}. In opposite to this \Macro{rightbotmark} shows the
+right part of that mark.
+
+\Macro{firstmark} is the first mark of the page that has been build last. This
+means the first mark, that has been set on the page. If there has not been set
+any mark on the page, this is the last mark of the already shipped out
+pages. \LaTeX{} command \Macro{rightmark} uses exaclty this mark. So it shows
+the right part of the first mark of the page. This is the same like
+\Macro{rightfirstmark}. In opposite to this \Macro{leftfirstmark} shows the
+left part of that mark.
+
+\Macro{topmark} is the content of \Macro{botmark} before building the current
+page. \LaTeX{} itself does not use it. Nevertheless, \Package{scrlayer}
+provides \Macro{lefttopmark} to show the left part of it and
+\Macro{righttopmark} to show the right part of it.
+
+Note\textnote{Attention!} that the left part and the right part of the mark
+can be made all together only. Even if you use
+\Macro{markright}\IndexCmd{markright} to change only the right part, the left
+part will be made again (unchanged). Accordingly in double-side mode using
+page style
+\Pagestyle{headings\important{\Pagestyle{headings}}\IndexPagestyle{headings}}
+the higher section levels always make both parts. For example
+\Macro{chaptermark} uses \Macro{markboth} with an empty right argument in this
+case. This is the reason why \Macro{rightmark} or \Macro{rightfirstmark}
+always shows an empty value on pages with chapter beginnings, even if there
+was a \Macro{sectionmark} or \Macro{section} on the same page to make the
+right part of the mark.
+
+Please note\textnote{Attention!} that using any of these commands to show the
+left or right part of the mark as part of the page content could have
+unexpected results. They are recommended to be used in the head or foot of a
+page style only. So with \Package{scrlayer} they should be part of the
+contents of a layer. But it does not matter whether or not a layer is
+restricted to the background or the foreground. Both kind of layers are
+shipped out after building the current page.
+
+If you need more information about the mark mechanism of \TeX, please have a
+look at \cite[chapter~23]{knuth:texbook}. You will find, that marks are an
+issue for real experts. So if the explanation above was at least more
+confusing than illuminative: Please don't worry.
+%
+\EndIndex{Cmd}{leftfirstmark}%
+\EndIndex{Cmd}{leftbotmark}%
+\EndIndex{Cmd}{lefttopmark}%
+\EndIndex{Cmd}{rightfirstmark}%
+\EndIndex{Cmd}{righttopmark}%
+\EndIndex{Cmd}{rightbotmark}%
+\fi
+
\begin{Declaration}
\Macro{@mkleft}\Parameter{left mark}\\
\Macro{@mkright}\Parameter{right mark}\\
@@ -743,9 +885,8 @@ to the commands \Macro{markleft}, \Macro{markright}, and \Macro{markboth}.%
\EndIndex{Cmd}{@mkright}%
\EndIndex{Cmd}{@mkleft}%
-
\fi %***************************************************** End only scrlayer *
-
+\fi %***************************************************** End only scrlayer *
\ifshortversion%
\IfCommon{scrlayer}{%
@@ -760,6 +901,6 @@ to the commands \Macro{markleft}, \Macro{markright}, and \Macro{markboth}.%
%%% mode: flyspell
%%% coding: iso-latin-1
%%% ispell-local-dictionary: "en_GB"
-%%% TeX-master: "scrlayer-de.tex"
+%%% TeX-master: "../guide.tex"
%%% TeX-PDF-mode: t
%%% End:
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 f1617a84f6c..967379068ef 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-2014
+% Copyright (c) Markus Kohm, 2001-2015
%
% 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-2014
+% Copyright (c) Markus Kohm, 2001-2015
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,17 +46,22 @@
% ======================================================================
\KOMAProvidesFile{common-5.tex}
- [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $
+ [$Date: 2015-01-28 11:03:48 +0100 (Wed, 28 Jan 2015) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi}
-% Date of the translated German file: 2014/06/25
+% Date of the translated German file: 2014/12/10
\makeatletter
\@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}%
\@ifundefined{ifCommonscrextend}{\newif\ifCommonscrextend}{}%
\@ifundefined{ifCommonscrlttr}{\newif\ifCommonscrlttr}{}%
\@ifundefined{ifIgnoreThis}{\newif\ifIgnoreThis}{}%
+\@ifundefined{ifCommonscrlayer-scrpage}{%
+ \expandafter\newif\csname ifCommonscrlayer-scrpage\endcsname
+}{}
+\expandafter\let\expandafter\ifCommonscrlayerscrpage
+\csname ifCommonscrlayer-scrpage\endcsname
\makeatother
@@ -79,6 +84,7 @@ supported. More information about the standard font facilities may be found at
\cite{lshort}, \cite{latex:usrguide}, and \cite{latex:fntguide}.
+\ifCommonscrlayerscrpage\else
\begin{Declaration}
\Macro{textsuperscript}\Parameter{Text}\\
\Macro{textsubscript}\Parameter{Text}
@@ -91,8 +97,7 @@ superscript\Index{text>superscript}\Index{superscript} text. Unfortunately,
{\LaTeX} itself does not offer a command to produce text in
subscript\Index{text>subscript}\Index{subscript} instead of
superscript\Index{text>superscript}\Index{superscript}. {\KOMAScript}
-defines \Macro{textsubscript} for this purpose.
-
+defines \Macro{textsubscript} for this purpose. %
\IfCommon{scrlttr2}{You may find an example of usage at
\autoref{sec:maincls.textmarkup},
\autopageref{desc:maincls.textsubscript.example}.}
@@ -161,6 +166,7 @@ geschweifte Klammern gesetzt wurden.%
%
\EndIndex{Cmd}{textsuperscript}%
\EndIndex{Cmd}{textsubscript}%
+\fi% \ifCommonscrlayerscrpage
\begin{Declaration}
@@ -196,26 +202,29 @@ command merely extends an existing definition. It is recommended to not use
both commands inside the document body, but only in the document preamble.
Usage examples can be found in the paragraphs on the corresponding element.
\fi %**************************************** End long version (not maincls) *
-Names and meanings of the individual items are listed in %
-\IfNotCommon{scrextend}{\autoref{tab:\csname
- label@base\endcsname.elementsWithoutText}}%
+Names\IfCommon{scrlayer-scrpage}{, defaults,} and meanings of the individual
+items are listed in %
+\IfNotCommon{scrextend}{\IfNotCommon{scrlayer-scrpage}{\autoref{tab:\csname
+ label@base\endcsname.elementsWithoutText}}}%
\IfCommon{scrextend}{\autoref{tab:maincls.elementsWithoutText},
\autopageref{tab:maincls.elementsWithoutText}}%
+\IfCommon{scrlayer-scrpage}{\autoref{tab:scrlayer-scrpage.fontelements}
+%, \autopageref{tab:scrlayer-scrpage.fontelements}
+}%
. %
\IfCommon{scrextend}{However only the listed elements for the document title,
dicta, footnotes, and the \Environment{labeling} environment are
supported. Though element \FontElement{disposition} exists, it will also be
used for the document title only. This has been done for compatibility with
the \KOMAScript{} classes. }%
-The default values are shown in the corresponding paragraphs.
+\IfNotCommon{scrlayer-scrpage}{The default values are shown in the
+ corresponding paragraphs.}%
\ifIgnoreThis %++++++++++++++++++++++++++++++++++++ short version (maincls) +
\else %----------------------------------------- long version (not maincls) -
With command \Macro{usekomafont} the current font style may be changed into
-the font style of the selected \PName{element}.
-%
+the font style of the selected \PName{element}.%
\ifCommonmaincls %++++++++++++++++++++++++++++++++++++++++++++ maincls only +
-%
\begin{Example}
\phantomsection\label{desc:maincls.setkomafont.example}%
Assume that you want to use for the element \FontElement{captionlabel} the
@@ -407,10 +416,10 @@ the font style of the selected \PName{element}.
\end{Example}
\fi %************************************************ end of scrextend only *
\ifCommonscrlttr %+++++++++++++++++++++++++++++++++++++++++++ scrlttr2 only +
+\par
A general example for the usage of \Macro{setkomafont} and \Macro{usekomafont}
may be found in \autoref{sec:maincls.textmarkup} at
-\autopageref{desc:maincls.setkomafont.example}.
-%
+\autopageref{desc:maincls.setkomafont.example}.%
\fi %************************************************* End of scrlttr2 only *
\fi %*************************************** End long version (not maincls) *
\ifCommonscrlttr % ++++++++++++++++++++++++++++++++++++++++++ scrlttr2 only +
@@ -521,9 +530,105 @@ may be found in \autoref{sec:maincls.textmarkup} at
\autopageref{desc:scrlttr2.variable.toname})}%
\end{desclist}
\fi %************************************************* End of scrlttr2 only *
+\ifCommonscrlayerscrpage % ++++++++++++++++++++++++++ nur scrlayer-scrpage +
+\begin{desclist}
+ \desccaption[{Alphabetical list of elements whose font can be changed in
+ \Class{scrlayer-scrpage} using the commands \Macro{setkomafont} and
+ \Macro{addtokomafont}}]%
+ {Alphabetical list of elements whose font can be changed in
+ \Class{scrlayer-scrpage} using the commands \Macro{setkomafont} and
+ \Macro{addtokomafont}%
+ \label{tab:scrlayer-scrpage.fontelements}%
+ }%
+ {Elements whose font can be changed (\emph{Fortsetzung})}%
+ \feentry{footbotline}{%
+ Horizontal line below the foot of a page style defined using
+ \Package{scrlayer-scrpage} (see
+ \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{desc:scrlayer-scrpage.fontelement.footbotline}). The font of
+ the element will be used after \Macro{normalfont}\IndexCmd{normalfont} and
+ after elements
+ \FontElement{pageheadfoot}\IndexFontElement{pageheadfoot} and
+ \FontElement{pagefoot}\IndexFontElement{pagefoot}. It is recommended to
+ use the element for colour changes only.\par
+ Default: \emph{leer}%
+ }%
+ \feentry{footsepline}{%
+ Horizontal line above the foot of a page style defined using
+ \Package{scrlayer-scrpage} (see
+ \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{desc:scrlayer-scrpage.fontelement.footsepline}). The font of
+ the element will be used after \Macro{normalfont}\IndexCmd{normalfont} and
+ after elements
+ \FontElement{pageheadfoot}\IndexFontElement{pageheadfoot} and
+ \FontElement{pagefoot}\IndexFontElement{pagefoot}. It is recommended to
+ use the element for colour changes only.\par
+ Default: \emph{leer}%
+ }%
+ \feentry{headsepline}{%
+ Horizontal line below the head of a page style defined using
+ \Package{scrlayer-scrpage} (see
+ \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{desc:scrlayer-scrpage.fontelement.headsepline}). The font of
+ the element will be used after \Macro{normalfont}\IndexCmd{normalfont} and
+ after elements
+ \FontElement{pageheadfoot}\IndexFontElement{pageheadfoot} and
+ \FontElement{pagehead}\IndexFontElement{pagehead}. It is recommended to
+ use the element for colour changes only.\par
+ Default: \emph{leer}%
+ }%
+ \feentry{headtopline}{%
+ Horizontal line below the head of a page style defined using
+ \Package{scrlayer-scrpage} (see
+ \autoref{sec:scrlayer-scrpage.pagestyle.content},
+ \autopageref{desc:scrlayer-scrpage.fontelement.headtopline}). The font of
+ the element will be used after \Macro{normalfont}\IndexCmd{normalfont} and
+ after elements
+ \FontElement{pageheadfoot}\IndexFontElement{pageheadfoot} and
+ \FontElement{pagehead}\IndexFontElement{pagehead}. It is recommended to
+ use the element for colour changes only.\par
+ Default: \emph{leer}%
+ }%
+ \feentry{pagefoot}{%
+ Content of the foot of a page style defined using
+ \Package{scrlayer-scrpage} (see
+ \autoref{sec:scrlayer-scrpage.predefined.pagestyles},
+ \autopageref{desc:scrlayer-scrpage.fontelement.pagefoot}). The font of
+ the element will be used after \Macro{normalfont}\IndexCmd{normalfont} and
+ after elements
+ \FontElement{pageheadfoot}\IndexFontElement{pageheadfoot}.\par
+ Default: \emph{leer}%
+ }%
+ \feentry{pagehead}{%
+ Content of the head of a page style defined using
+ \Package{scrlayer-scrpage} (see
+ \autoref{sec:scrlayer-scrpage.predefined.pagestyles},
+ \autopageref{desc:scrlayer-scrpage.fontelement.pagehead}). The font of
+ the element will be used after \Macro{normalfont}\IndexCmd{normalfont} and
+ after elements
+ \FontElement{pageheadfoot}\IndexFontElement{pageheadfoot}.\par
+ Default: \emph{leer}%
+ }%
+ \feentry{pageheadfoot}{%
+ Content of the head or foot of a page style defined using
+ \Package{scrlayer-scrpage} (see
+ \autoref{sec:scrlayer-scrpage.predefined.pagestyles},
+ \autopageref{desc:scrlayer-scrpage.fontelement.pageheadfoot}). The font of
+ the element will be used after \Macro{normalfont}\IndexCmd{normalfont}.\par
+ Default: \Macro{normalcolor}\Macro{slshape}%
+ }%
+ \feentry{pagenumber}{%
+ The pagination of \Macro{pagemark} (see
+ \autoref{sec:scrlayer-scrpage.predefined.pagestyles},
+ \autopageref{desc:scrlayer-scrpage.fontelement.pagenumber}). If you
+ redefine \Macro{pagemark} you have to make sure that the redefinition
+ contains the required\Macro{usekomafont}\PParameter{pagenumber}!\par
+ Default: \Macro{normalfont}%
+ }%
+\end{desclist}
+\fi % ****************************************** Ende nur scrlayer-scrpage *
\ifIgnoreThis %++++++++++++++++++++++++++++++++++++ short version (maincls) +
\else %----------------------------------------- long version (not maincls) -
-%
\EndIndex{Cmd}{setkomafont}%
\EndIndex{Cmd}{addtokomafont}%
\EndIndex{Cmd}{usekomafont}%
@@ -568,6 +673,8 @@ size and the baseline skip.%
%%% 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/guide.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/guide.tex
index ae9ac2f1d1d..2b1a065da0c 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-2014
+% Copyright (c) Markus Kohm, 2002-2015
%
% 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-2014
+% Copyright (c) Markus Kohm, 2002-2015
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -99,6 +99,7 @@
\include{scraddr}
\include{adrconvnote}
\include{scrextend}
+\include{scrjura}
\include{expertpart}
\include{scrbase}
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 cd634df084d..705b4d248d4 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
@@ -1,6 +1,6 @@
% ======================================================================
% scrbookreportarticle-experts.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2015
%
% 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-experts.tex
-% Copyright (c) Markus Kohm, 2001-2013
+% Copyright (c) Markus Kohm, 2001-2015
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -48,13 +48,13 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-experts.tex}
- [$Date: 2014-12-22 08:58:28 +0100 (Mon, 22 Dec 2014) $
+ [$Date: 2015-02-07 14:34:46 +0100 (Sat, 07 Feb 2015) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for
experts)]
\translator{Gernot Hassenpflug\and Markus Kohm}
-% Date of the translated German file: 2014/12/11
+% Date of the translated German file: 2015/02/07
\chapter{Additional Information about the Main Classes \Class{scrbook},
@@ -641,10 +641,13 @@ Please note\textnote{Attention!}: Currently you can define only headings for
section-like commands depending on \Macro{scr@startsection}. This is the style
\PValue{section}, that \KOMAScript{} uses for headings from \Macro{section}
down to \Macro{subparagraph}. Headings with the style of \Macro{part} or
-\Macro{chapter} are not yet supported. The special headings \Macro{addpart},
-\Macro{addchap} and \Macro{addsec} on the other hand depend indirectly on
-\Macro{part}, \Macro{chapter}, and \Macro{section}. Therefore they
-shouldn't be redefined directly using the commands described here.
+\Macro{chapter} are not yet supported. Nevertheless, the implementations of
+commands \Macro{part} and \Macro{chapter} support changing attributes using
+\Macro{DeclareSectionCommand} or \Macro{RedeclareSectionCommand}. The
+special headings \Macro{addpart}, \Macro{addchap} and \Macro{addsec} on the
+other hand depend indirectly on \Macro{part}, \Macro{chapter}, and
+\Macro{section}. Therefore they shouldn't be redefined directly using the
+commands described here.
\begin{Example}
Because of incomprehensible reasons, the headings of \Macro{paragraph}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex
new file mode 100644
index 00000000000..822c10bc08e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex
@@ -0,0 +1,74 @@
+% ======================================================================
+% scrjura.tex
+% Copyright (c) Markus Kohm, 2015
+%
+% 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.
+% ----------------------------------------------------------------------
+% scrjura.tex
+% Copyright (c) Markus Kohm, 2015
+%
+% 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 scrjura of the KOMA-Script guide
+% Maintained by Markus Kohm
+%
+% ----------------------------------------------------------------------
+%
+% Kapitel ueber scrjura in der KOMA-Script-Anleitung
+% Verwaltet von Markus Kohm
+%
+% ======================================================================
+
+
+\KOMAProvidesFile{scrjura.tex}
+ [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $
+ KOMA-Script guide (chapter: scrjura)]
+
+\chapter{Support for Jurists with \Package{scrjura}}
+\labelbase{scrjura}
+\BeginIndex{Package}{scrjura}
+
+In \cite{book:komascript} you can find a chapter about \Package{scrjura} at
+this place. Unfortunately, I could not find anyone with good enough English
+knowledge and the juristic vocabulary to translate that chapter into
+English. So I was not yet able to have such a chapter here in the free English
+users guide. Because of this I have also decided to add the chapter from
+the book not to the free German users guide. Nevertheless, if you understand
+German you may try the free manual by Dr.\,Alexander Willand. Unfortunately,
+this is only sometimes complete but sometimes outdated.%
+%
+\EndIndex{Package}{scrjura}
+
+%%% Local Variables:
+%%% mode: latex
+%%% mode: flyspell
+%%% coding: us-ascii
+%%% ispell-local-dictionary: "en_GB"
+%%% TeX-master: "../guide.tex"
+%%% 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 cef1c018a29..57796fde863 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-2014
+% Copyright (c) Markus Kohm, 2013-2015
%
% 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-2014
+% Copyright (c) Markus Kohm, 2013-2015
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -44,7 +44,7 @@
% ============================================================================
\KOMAProvidesFile{scrlayer-scrpage-experts.tex}%
- [$Date: 2014-01-24 14:08:15 +0100 (Fri, 24 Jan 2014) $
+ [$Date: 2015-01-28 11:03:48 +0100 (Wed, 28 Jan 2015) $
KOMA-Script guide (chapter: scrlayer-scrpage-experts)]
\translator{Markus Kohm}
@@ -62,6 +62,8 @@ described in \autoref{cha:scrlayer-scrpage} of this \iffree{user
not need those extensions and some of them are only provided for
compatibility with \Package{scrpage2}.
+\LoadCommon[scrlayerscrpageexperts]{21}% \section{Manipulation of Defined Page Styles}
+
\section{Definition of new Pairs of Page Styles}
\label{sec:scrlayer-scrpage.pagestyle.pairs}
@@ -552,21 +554,21 @@ 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,
+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{.head.below.line} 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
+one-side layout, and last but not least \PName{Name}\PValue{.foot.below.line}
+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}.%
%
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 250e4c8a8c9..6e42dba9af3 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-2014
+% Copyright (c) Markus Kohm, 2013-2015
%
% 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-2014
+% Copyright (c) Markus Kohm, 2013-2015
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -44,7 +44,7 @@
% ============================================================================
\KOMAProvidesFile{scrlayer-scrpage.tex}%
- [$Date: 2014-12-12 09:55:47 +0100 (Fri, 12 Dec 2014) $
+ [$Date: 2015-01-28 11:03:48 +0100 (Wed, 28 Jan 2015) $
KOMA-Script guide (chapter: scrlayer-scrpage)]
\translator{Markus Kohm\and Jana Schubert\and Jens H\"uhne}
@@ -113,6 +113,8 @@ insufficient for your purposes you are encouraged to examine
\LoadCommon{20} % \section{Head and Foot Width}
+\LoadCommon{5} % \section{Text Markup}
+
\section{Usage of Predefined Page Styles}
\label{sec:scrlayer-scrpage.predefined.pagestyles}
@@ -1096,7 +1098,7 @@ Options \Option{komastyle} and \Option{standardstyle}, provided by
\EndIndex{Option}{pagestyleset~=standard}%
\EndIndex{Option}{pagestyleset~=KOMA-Script}%
-\LoadCommon{21} % \section{Manipulation of Defined Page Styles}
+\LoadCommon[scrlayerscrpage]{21} % \section{Manipulation of Defined Page Styles}
\begin{Declaration}
\KOption{headwidth}\PName{width\textup{:}offset\textup{:}offset}\\
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 5f6b18760ab..40384415ab5 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
@@ -1,6 +1,6 @@
% ======================================================================
% scrlayer.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2015
%
% 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.tex
-% Copyright (c) Markus Kohm, 2013
+% Copyright (c) Markus Kohm, 2013-2015
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,20 +46,20 @@
% ============================================================================
\KOMAProvidesFile{scrlayer.tex}
- [$Date: 2013-12-31 12:58:50 +0100 (Tue, 31 Dec 2013) $
+ [$Date: 2015-02-03 08:27:01 +0100 (Tue, 03 Feb 2015) $
KOMA-Script guide (chapter:scrlayer)]
\translator{Markus Kohm}
-% Date of the translated file: 2013-10-31
+% Date of the translated file: 2015-02-03
\chapter[{Defining Layers and Page Styles Using \Package{scrlayer}}]%
{Defining Layers and Page Styles Using \Package{scrlayer}%
}
\labelbase{scrlayer}
-\BeginIndex{Package}{scrlayer}
-
+\BeginIndex{Package}{scrlayer}%
+\BeginIndex{}{layer}%
Most users of graphics software already know layer models for pages or working
sheets. \LaTeX{} itself does not know layers, but there are already packages
like \Package{eso-pic} or \Package{textpos}, that provide a kind of
@@ -295,6 +295,45 @@ there has not been a layer with \PName{layer name} defined before.
}{%
Options for the definition of layers (\emph{Continuation})%
}%
+ \ifnum\currentversionlt{3.16}\else
+ \nentry{%
+ \ChangedAt{v3.16}{\Package{scrlayer}}%
+ \KOption{addcontents}\PName{Code}}{%
+ Value \PName{code} will be added (or appended) at the very end of the
+ current value of attribute \Option{contents}. So the new content will be
+ generated behind the end of the already existing content. For more
+ information about the handling of \PName{code} see option
+ \Option{contents}.%
+ }%
+ \nentry{%
+ \ChangedAt{v3.16}{\Package{scrlayer}}%
+ \KOption{addheight}\PName{additional height}}{%
+ The current value of attribute \Option{height} will be increased by the
+ value of this option. You can use the same kind of values as for
+ \Option{height}.%
+ }%
+ \nentry{%
+ \ChangedAt{v3.16}{\Package{scrlayer}}%
+ \KOption{addhoffset}\PName{additional horizontal offset}}{%
+ The current value of attribute \Option{hoffset} will be increased by the
+ value of this option. You can use the same kind of values as for
+ \Option{hoffset}.%
+ }%
+ \nentry{%
+ \ChangedAt{v3.16}{\Package{scrlayer}}%
+ \KOption{addvoffset}\PName{additional vertical offset}}{%
+ The current value of attribute \Option{voffset} will be increased by the
+ value of this option. You can use the same kind of values as for
+ \Option{voffset}.%
+ }%
+ \nentry{%
+ \ChangedAt{v3.16}{\Package{scrlayer}}%
+ \KOption{addwidth}\PName{additional width}}{%
+ The current value of attribute \Option{width} will be increased by the
+ value of this option. You can use the same kind of values as for
+ \Option{width}.%
+ }%
+ \fi
\nentry{\KOption{align}{\PName{alignment characters}}}{%
The \PName{alignment characters} define the desired alignment of the
layer. Each \PName{alignment character} influences either, how argument
@@ -454,6 +493,16 @@ there has not been a layer with \PName{layer name} defined before.
vertically span the whole paper from the left edge to the right edge and
the top edge to the bottom edge.%
}%
+ \ifnum\currentversionlt{3.16}\else
+ \nentry{%
+ \ChangedAt{v3.16}{\Package{scrlayer}}%
+ \KOption{pretocontents}\PName{code}}{%
+ Value \PName{code} will be added at the very beginning of the current
+ value of attribute \Option{contents}. So the new content will be generated
+ in front of the already existing content. For more information about the
+ handling of \PName{code} see option \Option{contents}.%
+ }%
+ \fi
\entry{\Option{rightmargin}}{%
The composed option sets \Option{hoffset}, \Option{voffset},
\Option{width}, \Option{height}, and \Option{align} to horizontally span
@@ -519,6 +568,20 @@ result in unpredictable issues.%
\EndIndex{Cmd}{layeryoffset}%
\EndIndex{Cmd}{layerxoffset}%
+\ifnum\currentversionlt{3.16}\else
+\begin{Declaration}
+ \Macro{GetLayerContents}\Parameter{layer name}
+\end{Declaration}
+\BeginIndex{Cmd}{GetLayerContents}%
+This\ChangedAt{v3.16}{\Package{scrlayer}} command results in the whole content
+of a layer. You have to note\textnote{Attention!} that using this
+command inside the \PName{code} of the layer attributes \Option{contents},
+\Option{addcontents}, or \Option{pretocontents} can result in
+an infinite recursion, if the content of the current layer is referenced. You
+yourself should avoid such situations!%
+\EndIndex{Cmd}{GetLayerContents}%
+\fi
+
\begin{Declaration}
\Macro{IfLayerExists}%
\Parameter{string}\Parameter{then-code}\Parameter{else-code}
@@ -1229,6 +1292,7 @@ used, e.g., to automatically destroy layers or page styles (see
\Macro{DestroyRealLayerPageStyle}).%
\EndIndex{Cmd}{scrlayerOnAutoRemoveInterface}%
%
+\EndIndex{}{layer}
\EndIndex{Package}{scrlayer}
%%% Local Variables:
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 6a588acaec0..7e0f368fdbd 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
@@ -50,7 +50,7 @@
%%
%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
\ProvidesFile{tocbasic.tex}[%
- 2015/01/14 v3.15 KOMA-Script
+ 2015/02/07 v3.16 KOMA-Script
package
(handling toc-files)%
]