From 81cddd7517e67e55f78f585fe591499404736882 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Mar 2021 21:34:33 +0000 Subject: koma-script (21mar21) git-svn-id: svn://tug.org/texlive/trunk@58585 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/koma-script/Makefile | 14 +- .../koma-script/doc/english/common-footnotes.tex | 47 +- .../latex/koma-script/doc/english/common-lists.tex | 39 +- .../doc/english/common-pagestylemanipulation.tex | 6 +- .../koma-script/doc/english/common-textmarkup.tex | 90 +- .../source/latex/koma-script/doc/english/guide.tex | 9 +- .../latex/koma-script/doc/english/scrjura.tex | 4 +- .../latex/koma-script/doc/english/scrlttr2.tex | 10 +- .../source/latex/koma-script/doc/guide.tex | 9 +- .../koma-script/doc/ngerman/common-footnotes.tex | 26 +- .../latex/koma-script/doc/ngerman/common-lists.tex | 28 +- .../koma-script/doc/ngerman/common-textmarkup.tex | 65 +- .../source/latex/koma-script/doc/ngerman/guide.tex | 9 +- .../latex/koma-script/doc/ngerman/scrjura.tex | 8 +- .../latex/koma-script/doc/ngerman/scrlttr2.tex | 8 +- .../source/latex/koma-script/doc/scrguide.cls | 96 +- .../source/latex/koma-script/doc/scrguide.html | 1544 +++++++++---------- .../source/latex/koma-script/doc/scrguide.pdf | Bin 3262021 -> 3271249 bytes .../source/latex/koma-script/doc/scrguien.html | 1590 ++++++++++---------- .../source/latex/koma-script/doc/scrguien.pdf | Bin 3180171 -> 3186652 bytes .../source/latex/koma-script/scrkernel-basics.dtx | 225 ++- .../latex/koma-script/scrkernel-compatibility.dtx | 10 +- .../latex/koma-script/scrkernel-footnotes.dtx | 16 +- .../koma-script/scrkernel-listsandtabulars.dtx | 68 +- .../latex/koma-script/scrkernel-miscellaneous.dtx | 14 +- .../latex/koma-script/scrkernel-notepaper.dtx | 22 +- .../latex/koma-script/scrkernel-paragraphs.dtx | 115 +- .../latex/koma-script/scrkernel-sections.dtx | 30 +- .../source/latex/koma-script/scrkernel-version.dtx | 4 +- .../source/latex/koma-script/scrlayer-fancyhdr.dtx | 553 ------- .../source/latex/koma-script/scrlayer.dtx | 93 +- .../source/latex/koma-script/scrlfile-hook.dtx | 34 +- .../source/latex/koma-script/scrlfile.dtx | 45 +- 33 files changed, 2434 insertions(+), 2397 deletions(-) delete mode 100644 Master/texmf-dist/source/latex/koma-script/scrlayer-fancyhdr.dtx (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/koma-script/Makefile b/Master/texmf-dist/source/latex/koma-script/Makefile index cd385982daa..1fc53353d74 100644 --- a/Master/texmf-dist/source/latex/koma-script/Makefile +++ b/Master/texmf-dist/source/latex/koma-script/Makefile @@ -1,6 +1,6 @@ # ====================================================================== # Makefile -# Copyright (c) Markus Kohm, 2002-2020 +# Copyright (c) Markus Kohm, 2002-2021 # # This file is part of the LaTeX2e KOMA-Script bundle. # @@ -18,7 +18,7 @@ # This work consists of all files listed in manifest.txt. # ---------------------------------------------------------------------- # Makefile -# Copyright (c) Markus Kohm, 2002-2020 +# Copyright (c) Markus Kohm, 2002-2021 # # Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, # Version 1.3c, verteilt und/oder veraendert werden. @@ -138,8 +138,7 @@ CLS_MAIN = scrbook.cls \ KakuLL.lco \ scrlayer.sty \ scrlayer-scrpage.sty \ - scrlayer-notecolumn.sty \ - scrlayer-fancyhdr.sty + scrlayer-notecolumn.sty CLS_MAIN_DTX = scrkernel-basics.dtx \ scrkernel-bibliography.dtx \ @@ -178,8 +177,7 @@ CLS_MAIN_DTX = scrkernel-basics.dtx \ tocbasic.dtx \ scrlayer.dtx \ scrlayer-scrpage.dtx \ - scrlayer-notecolumn.dtx \ - scrlayer-fancyhdr.dtx + scrlayer-notecolumn.dtx STATIC_DOC = README \ INSTALL.txt \ @@ -195,9 +193,9 @@ CLS_MAIN_INS = scrmain.ins CLS_MAIN_SUBINS = scrstrip.inc scrstrop.inc scrdocstrip.tex -ALPHA_INS = scrlayer-fancyhdr.dtx +ALPHA_INS = -ALPHA_DOC = scrlayer-fancyhdr.pdf +ALPHA_DOC = ALPHA_DTX = $(subst .pdf,.dtx,$(ALPHA_DOC)) diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-footnotes.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-footnotes.tex index 2a3e8cac1dd..05f3555233f 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-footnotes.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-footnotes.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-footnotes.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % common-footnotes.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,11 +46,11 @@ % ====================================================================== \KOMAProvidesFile{common-footnotes.tex} - [$Date: 2019-11-20 08:38:35 +0100 (Wed, 20 Nov 2019) $ + [$Date: 2021-02-25 09:21:33 +0100 (Thu, 25 Feb 2021) $ KOMA-Script guide (common paragraphs: Footnotes)] \translator{Markus Kohm\and Krickette Murabayashi\and Karl Hagen} -% Date of the translated German file: 2019-11-20 +% Date of the translated German file: 2021-05-25 \section{Footnotes} \seclabel{footnotes}% @@ -305,20 +305,31 @@ other marks for this footnote in the text. commands. The footnote text will be produced by \DescRef{\ThisCommonLabelBase.cmd.footnote}. \end{Example} - \fi When setting footnote marks with the \Macro{label} mechanism, any - changes to the footnote numbers will require at least two \LaTeX{} runs to - ensure correct numbers for all \Macro{footref} marks.% - \IfThisCommonLabelBaseOneOf{scrlttr2,scrextend}{\par% - You can find an example of how to use \Macro{footref} in - \autoref{sec:\ThisCommonFirstLabelBase.footnotes} on - \PageRefxmpl{\ThisCommonFirstLabelBase.cmd.footref}.% - }{} \IfThisCommonLabelBase{scrlttr2}{}{% - \par - Note\textnote{Attention!} that statements like \Macro{ref}\IndexCmd{ref} - or \Macro{pageref}\IndexCmd{pageref} are fragile and therefore you should - put \Macro{protect}\IndexCmd{protect} in front of them if they appear in - moving arguments such as headings.% - }% +\fi% +When setting footnote marks with the \Macro{label} mechanism, any +changes to the footnote numbers will require at least two \LaTeX{} runs to +ensure correct numbers for all \Macro{footref} marks.% +\IfThisCommonLabelBaseOneOf{scrlttr2,scrextend}{\par% + You can find an example of how to use \Macro{footref} in + \autoref{sec:\ThisCommonFirstLabelBase.footnotes} on + \PageRefxmpl{\ThisCommonFirstLabelBase.cmd.footref}. % +}{}% +\IfThisCommonLabelBase{scrlttr2}{}{% + \par + Note\textnote{Attention!} that statements like \Macro{ref}\IndexCmd{ref} + or \Macro{pageref}\IndexCmd{pageref} are fragile and therefore you should + put \Macro{protect}\IndexCmd{protect} in front of them if they appear in + moving arguments such as headings. % +}% +By the way, from\IfThisCommonLabelBase{maincls}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}\and \Package{scrextend}}% +}{% + \IfThisCommonLabelBase{scrlttr2}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + }{}% +} % +\LaTeX{} 2021-05-01 on, the command is provided by \LaTeX{} itself.% \EndIndexGroup diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-lists.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-lists.tex index 12bb0ca90c4..a01c311f98f 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-lists.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-lists.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-lists.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % common-lists.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,12 +46,12 @@ % ====================================================================== \KOMAProvidesFile{common-lists.tex} - [$Date: 2019-11-19 12:56:28 +0100 (Tue, 19 Nov 2019) $ + [$Date: 2021-02-15 19:40:44 +0100 (Mon, 15 Feb 2021) $ KOMA-Script guide (common paragraphs)] \translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and Karl Hagen} -% Date of the translated German file: 2019-11-19 +% Date of the translated German file: 2021-02-15 \section{Lists} \seclabel{lists}% @@ -123,11 +123,32 @@ \fi% Depending on the level, \KOMAScript{} classes use the following marks: ``{\labelitemi}'', ``{\labelitemii}'', ``{\labelitemiii}'', and - ``{\labelitemiv}''. The definition of these symbols is specified in - the macros \Macro{labelitemi}, \Macro{labelitemii}, - \Macro{labelitemiii}, and \Macro{labelitemiv}, all of which you can - redefine using \Macro{renewcommand}. Every item is introduced with - \Macro{item}.% + ``{\labelitemiv}''. The definition of these symbols is specified in the + macros \Macro{labelitemi}, \Macro{labelitemii}, \Macro{labelitemiii}, and + \Macro{labelitemiv}, all of which you can redefine using + \Macro{renewcommand}. + \BeginIndex{FontElement}{itemizelabel}\LabelFontElement{itemizelabel}% + \BeginIndex{FontElement}{labelitemi}\LabelFontElement{labelitemi}% + \BeginIndex{FontElement}{labelitemii}\LabelFontElement{labelitemii}% + \BeginIndex{FontElement}{labelitemiii}\LabelFontElement{labelitemiii}% + \BeginIndex{FontElement}{labelitemiv}\LabelFontElement{labelitemiv}% + With the \KOMAScript{} classes the + fonts\Index{font>style}\ChangedAt{v3.33}{\Class{scrbook}\and + \Class{scrreprt}\and \Class{scrartcl}} used to format the symbols for the + different levels can be changed using + \DescRef{\ThisCommonLabelBase.cmd.setkomafont} and + \DescRef{\ThisCommonLabelBase.cmd.addtokomafont} (see + \autoref{sec:\ThisCommonLabelBase.textmarkup}, + \DescPageRef{\ThisCommonLabelBase.cmd.setkomafont}) for the elements + \FontElement{labelitemi}\important{\FontElement{labelitemi}}, + \FontElement{labelitemii}\important{\FontElement{labelitemii}}, + \FontElement{labelitemiii}\important{\FontElement{labelitemiii}} and + \FontElement{labelitemiv}\important{\FontElement{labelitemiv}}. By default + these all use the font setting for element + \FontElement{itemizelabel}\important{\FontElement{itemizelabel}}. Only + element \FontElement{labelitemii} additionally uses \Macro{bfseries}. The + default of \FontElement{itemizelabel} itself is \Macro{normalfont}. Every + item is introduced with \Macro{item}.% \IfThisCommonFirstRun{\iftrue}{\csname iffalse\endcsname} \begin{Example} \phantomsection\xmpllabel{env.itemize}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex index 1ee59ed0032..cc42a49a504 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-pagestylemanipulation.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-pagestylemanipulation.tex -% Copyright (c) Markus Kohm, 2013-2019 +% Copyright (c) Markus Kohm, 2013-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % common-pagestylemanipulation.tex -% Copyright (c) Markus Kohm, 2013-2019 +% Copyright (c) Markus Kohm, 2013-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -580,7 +580,7 @@ \Macro{rightmark} depending on whether the current page is even or odd. The \Macro{pagemark}\important{\Macro{pagemark}} command has nothing to do - with \TeX's mark mechanism. It is serves to output a formatted page number. + with \TeX's mark mechanism. It is used to output a formatted page number. \BeginIndex{FontElement}{pagenumber}\LabelFontElement{pagenumber}% The font of element \FontElement{pagenumber}\important{\FontElement{pagenumber}} will be used diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex index 6662cd551ed..f49f8e968e5 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-textmarkup.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-textmarkup.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % common-textmarkup.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,12 +46,12 @@ % ====================================================================== \KOMAProvidesFile{common-textmarkup.tex} - [$Date: 2019-12-02 09:50:10 +0100 (Mon, 02 Dec 2019) $ + [$Date: 2021-02-15 19:40:44 +0100 (Mon, 15 Feb 2021) $ KOMA-Script guide (common paragraphs)] \translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and Karl Hagen} -% Date of the translated German file: 2019-12-02 +% Date of the translated German file: 2021-05-15 \section{Text Markup} \seclabel{textmarkup}% @@ -360,6 +360,12 @@ refer to the sections for the respective element.% \Class{scrreprt}\and \Class{scrartcl}} above the footnotes at the end of the text area (see \autoref{sec:maincls.footnotes}, \DescPageRef{maincls.cmd.setfootnoterule})}% + \feentry{itemizelabel}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Default for the preset symbols of the environment + \DescRef{\ThisCommonLabelBase.env.itemize} (see + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% \feentry{labelinglabel}{labels, i.\,e., the optional argument of \DescRef{\ThisCommonLabelBase.cmd.item.labeling} in the \DescRef{\ThisCommonLabelBase.env.labeling} environment (see @@ -369,6 +375,30 @@ refer to the sections for the respective element.% addition to the element \DescRef{\ThisCommonLabelBase.fontelement.labelinglabel} (see \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.labeling})}% + \feentry{labelitemi}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemi} (see + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% + \feentry{labelitemii}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemii} (see + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% + \feentry{labelitemiii}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemiii} (see + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% + \feentry{labelitemiv}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemiv} (see + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% \feentry{minisec}{title of \DescRef{\ThisCommonLabelBase.cmd.minisec} (see \autoref{sec:maincls.structure} ab \DescPageRef{maincls.cmd.minisec})}% \feentry{pagefoot}{only used if package \Package{scrlayer-scrpage} has @@ -422,14 +452,14 @@ refer to the sections for the respective element.% \DescRef{\ThisCommonLabelBase.cmd.section} level, differing from the \DescRef{\ThisCommonLabelBase.fontelement.sectionentry} element, \Macro{normalfont} and \Macro{normalsize} (only available in - \Class{scrartcl}, see - \autoref{sec:maincls.toc}, \DescPageRef{maincls.cmd.tableofcontents})}% + \Class{scrartcl}, see \autoref{sec:maincls.toc}, + \DescPageRef{maincls.cmd.tableofcontents})}% \feentry{sectionentrypagenumber}{% page number of the table of contents entry for the sectioning command \DescRef{\ThisCommonLabelBase.cmd.section}; applied in addition to element \DescRef{\ThisCommonLabelBase.fontelement.sectionentry} (only available in \Class{scrartcl}, see \autoref{sec:maincls.toc}, - \DescPageRef{maincls.cmd.tableofcontents})}% + \DescPageRef{maincls.cmd.tableofcontents})}% \feentry{sectioning}{alternative name for \DescRef{\ThisCommonLabelBase.fontelement.disposition}}% \feentry{subject}{% @@ -515,7 +545,7 @@ refer to the sections for the respective element.% footnote text and marker (\autoref{sec:scrlttr2.footnotes}, \DescPageRef{scrlttr2.cmd.footnote})}% \feentry{footnotelabel}{% - footnote marker; applied in addition to the + footnote marker; applied in addition to the \DescRef{\ThisCommonLabelBase.fontelement.footnote} element (\autoref{sec:scrlttr2.footnotes}, \DescPageRef{scrlttr2.cmd.footnote})}% @@ -532,13 +562,18 @@ refer to the sections for the respective element.% (\autoref{sec:scrlttr2.firstpage}, \DescPageRef{scrlttr2.variable.fromaddress})}% \feentry{fromname}{% - sender's name in the letterhead, not including - \PValue{fromaddress} (\autoref{sec:scrlttr2.firstpage}, + sender's name in the letterhead, not including \PValue{fromaddress} + (\autoref{sec:scrlttr2.firstpage}, \DescPageRef{scrlttr2.variable.fromname})}% \feentry{fromrule}{% - horizontal rule in the letterhead; intended for - colour changes (\autoref{sec:scrlttr2.firstpage}, + horizontal rule in the letterhead; intended for colour changes + (\autoref{sec:scrlttr2.firstpage}, \DescPageRef{scrlttr2.option.fromrule})}% + \feentry{itemizelabel}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Default for the preset symbols of the environment + \DescRef{\ThisCommonLabelBase.env.itemize} (see + \autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.itemize})}% \feentry{labelinglabel}{% labels, i.\,e. the optional argument of \DescRef{\ThisCommonLabelBase.cmd.item.labeling} in the @@ -547,11 +582,31 @@ refer to the sections for the respective element.% \DescPageRef{scrlttr2.env.labeling})}% \feentry{labelingseparator}{% separator, i.\,e. the optional argument of the - \DescRef{\ThisCommonLabelBase.env.labeling} environment; applied - in addition to the + \DescRef{\ThisCommonLabelBase.env.labeling} environment; applied in + addition to the \DescRef{\ThisCommonLabelBase.fontelement.labelinglabel} element (see \autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.labeling})}% + \feentry{labelitemi}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemi} (see + \autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.itemize})}% + \feentry{labelitemii}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemii} (see + \autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.itemize})}% + \feentry{labelitemiii}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemiii} (see + \autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.itemize})}% + \feentry{labelitemiv}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Font to be used in the item symbol definition + \DescRef{\ThisCommonLabelBase.cmd.labelitemiv} (see + \autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.itemize})}% \feentry{pagefoot}{% depending on the page style used after the \DescRef{\ThisCommonLabelBase.fontelement.pageheadfoot} element for @@ -563,9 +618,8 @@ refer to the sections for the respective element.% the header (\autoref{sec:\LabelBase.pagestyle}, \DescPageRef{\LabelBase.fontelement.pagefoot})}% \feentry{pageheadfoot}{% - the header and footer of a page for all page styles - that have been defined using \KOMAScript{} - (\autoref{sec:\LabelBase.pagestyle}, + the header and footer of a page for all page styles that have been + defined using \KOMAScript{} (\autoref{sec:\LabelBase.pagestyle}, \DescPageRef{\ThisCommonLabelBase.fontelement.pageheadfoot})}% \feentry{pagenumber}{% page number in the header or footer % @@ -608,7 +662,7 @@ refer to the sections for the respective element.% address field (\autoref{sec:scrlttr2.firstpage}, \DescPageRef{scrlttr2.variable.toaddress})}% \feentry{toname}{% - variation of the + variation of the \DescRef{\ThisCommonLabelBase.fontelement.addressee} element to format the recipient's name in the address field (\autoref{sec:scrlttr2.firstpage}, 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 1699a73c406..85c0617f26b 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-2018 +% Copyright (c) Markus Kohm, 2002-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % guide.tex -% Copyright (c) Markus Kohm, 2002-2018 +% Copyright (c) Markus Kohm, 2002-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -48,7 +48,7 @@ \documentclass{scrguide} \KOMAProvidesFile{guide.tex} - [$Date: 2018-12-22 17:30:41 +0100 (Sat, 22 Dec 2018) $ + [$Date: 2021-01-02 15:55:38 +0100 (Sat, 02 Jan 2021) $ KOMA-Script (guide main file)] \begin{document} @@ -122,7 +122,8 @@ \let\toclevel@chapter\toclevel@part \makeatother \printchangelog -\bibliography{\jobname} + +\printbibliography[prenote=bibpreamble] \GuideIndexSeeAlsos diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex index da5cad125c6..f43d00b9f30 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex @@ -46,12 +46,12 @@ % ====================================================================== \KOMAProvidesFile{scrjura.tex}% - [$Date: 2019-12-03 09:41:21 +0100 (Tue, 03 Dec 2019) $ + [$Date: 2021-02-25 13:15:44 +0100 (Thu, 25 Feb 2021) $ KOMA-Script guide (chapter: scrjura)] \translator{Alexander Willand\and Markus Kohm\and Karl Hagen} -% Date of the translated German file: 2019-12-03 +% Date of the translated German file: 2021-05-25 \chapter{Support for the Law Office with \Package{scrjura}} \labelbase{scrjura} 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 1c0a82a4400..fd0e2999db3 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-2019 +% Copyright (c) Markus Kohm, 2002-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrlttr2.tex -% Copyright (c) Markus Kohm, 2002-2019 +% Copyright (c) Markus Kohm, 2002-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,14 +46,14 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2.tex}% - [$Date: 2019-12-03 09:41:21 +0100 (Tue, 03 Dec 2019) $ + [$Date: 2021-02-25 09:27:06 +0100 (Thu, 25 Feb 2021) $ KOMA-Script guide (chapter: scrlttr2)] \translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe Morawski\and Stephan Hennig\and Gernot Hassenpflug\and Markus Kohm\and Karl Hagen} -% Date of the translated German file: 2019-12-03 +% Date of the translated German file: 2021-05-25 \chapter{Letters with the \Class{scrlttr2} Class or the \Package{scrletter} Package} @@ -755,7 +755,7 @@ exists for package authors.% \Macro{Ifplength}\Parameter{pseudo-length}% \Parameter{then-code}\Parameter{else-code} \end{Declaration} -This\ChangedAt{v3.27}{\Class{scrlttr2}\and \Class{scrletter}} command can be +This\ChangedAt{v3.27}{\Class{scrlttr2}\and \Package{scrletter}} command can be used to determine whether a \PName{pseudo-length} has been defined. The \PName{then-code} is executed if the \PName{pseudo-length} is defined and not \Macro{relax}. Otherwise the \PName{else-code} is executed. diff --git a/Master/texmf-dist/source/latex/koma-script/doc/guide.tex b/Master/texmf-dist/source/latex/koma-script/doc/guide.tex index 1699a73c406..85c0617f26b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/guide.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/guide.tex @@ -1,6 +1,6 @@ % ====================================================================== % guide.tex -% Copyright (c) Markus Kohm, 2002-2018 +% Copyright (c) Markus Kohm, 2002-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % guide.tex -% Copyright (c) Markus Kohm, 2002-2018 +% Copyright (c) Markus Kohm, 2002-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -48,7 +48,7 @@ \documentclass{scrguide} \KOMAProvidesFile{guide.tex} - [$Date: 2018-12-22 17:30:41 +0100 (Sat, 22 Dec 2018) $ + [$Date: 2021-01-02 15:55:38 +0100 (Sat, 02 Jan 2021) $ KOMA-Script (guide main file)] \begin{document} @@ -122,7 +122,8 @@ \let\toclevel@chapter\toclevel@part \makeatother \printchangelog -\bibliography{\jobname} + +\printbibliography[prenote=bibpreamble] \GuideIndexSeeAlsos diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-footnotes.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-footnotes.tex index a0d7f94bcb6..d1ffab0cbe8 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-footnotes.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-footnotes.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-footnotes.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % common-footnotes.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{common-footnotes.tex}% - [$Date: 2019-11-20 08:38:35 +0100 (Wed, 20 Nov 2019) $ + [$Date: 2021-02-25 09:21:33 +0100 (Thu, 25 Feb 2021) $ KOMA-Script guide (common paragraphs)] \section{Fußnoten} @@ -389,19 +389,29 @@ weiteren Fußnotenmarken für diese Fußnote im Text setzen. Da die Fußnotenmarken mit Hilfe des \Macro{label}-Mechanismus gesetzt werden, werden nach Änderungen, die sich auf die Fußnotennummerierung auswirken, gegebenenfalls zwei \LaTeX-Durchläufe benötigt, bis die mit \Macro{footref} -gesetzten Marken korrekt sind.% +gesetzten Marken korrekt sind. % \IfThisCommonLabelBaseOneOf{scrlttr2,scrextend}{% - \ Ein passendes Beispiel ist in + Ein passendes Beispiel ist in \autoref{sec:\ThisCommonFirstLabelBase.footnotes} auf - \PageRefxmpl{\ThisCommonFirstLabelBase.cmd.footref} zu finden.% -}{} + \PageRefxmpl{\ThisCommonFirstLabelBase.cmd.footref} zu finden. % +}{}% \IfThisCommonLabelBaseOneOf{scrlttr2,scrextend}{}{% \par Es\textnote{Achtung!} sei darauf hingewiesen, dass die Anweisung genau wie \Macro{ref}\IndexCmd{ref} oder \Macro{pageref}\IndexCmd{pageref} zerbrechlich ist und deshalb in beweglichen Argumenten wie Überschriften - \Macro{protect}\IndexCmd{protect} davor gestellt werden sollte.% + \Macro{protect}\IndexCmd{protect} davor gestellt werden sollte. % }% +Ab\IfThisCommonLabelBase{maincls}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}\and \Package{scrextend}}% +}{% + \IfThisCommonLabelBase{scrlttr2}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + }{}% +} % +\LaTeX{} 2021-05-01 wird die Anweisung übrigens von \LaTeX{} selbst +bereitgestellt.% \EndIndexGroup \begin{Declaration} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-lists.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-lists.tex index 0591053c4a0..cb6abd1da67 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-lists.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-lists.tex @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{common-lists.tex}% - [$Date: 2019-11-19 12:56:28 +0100 (Tue, 19 Nov 2019) $ + [$Date: 2021-02-15 19:40:44 +0100 (Mon, 15 Feb 2021) $ KOMA-Script guide (common paragraphs)] \section{Listen} @@ -131,8 +131,30 @@ »{\labelitemii}«, »{\labelitemiii}« und »{\labelitemiv}«. Die Definition der Zeichen für die einzelnen Ebenen sind in den Makros \Macro{labelitemi}, \Macro{labelitemii}, \Macro{labelitemiii} und \Macro{labelitemiv} - abgelegt. Sie können diese leicht mit \Macro{renewcommand} umdefinieren. Die - einzelnen Stichpunkte werden mit \Macro{item} eingeleitet.% + abgelegt. Sie können diese leicht mit \Macro{renewcommand} umdefinieren. + \BeginIndex{FontElement}{itemizelabel}\LabelFontElement{itemizelabel}% + \BeginIndex{FontElement}{labelitemi}\LabelFontElement{labelitemi}% + \BeginIndex{FontElement}{labelitemii}\LabelFontElement{labelitemii}% + \BeginIndex{FontElement}{labelitemiii}\LabelFontElement{labelitemiii}% + \BeginIndex{FontElement}{labelitemiv}\LabelFontElement{labelitemiv}% + Die Schriftart\Index{Schrift>Art}\ChangedAt{v3.33}{\Class{scrbook}\and + \Class{scrreprt}\and \Class{scrartcl}} der Zeichen für die einzelnen + Ebenen kann außerdem bei den \KOMAScript-Klassen mit Hilfe der Anweisungen + \DescRef{\ThisCommonLabelBase.cmd.setkomafont} und + \DescRef{\ThisCommonLabelBase.cmd.addtokomafont} (siehe + \autoref{sec:\ThisCommonLabelBase.textmarkup}, + \DescPageRef{\ThisCommonLabelBase.cmd.setkomafont}) für die Elemente + \FontElement{labelitemi}\important{\FontElement{labelitemi}}, + \FontElement{labelitemii}\important{\FontElement{labelitemii}}, + \FontElement{labelitemiii}\important{\FontElement{labelitemiii}} und + \FontElement{labelitemiv}\important{\FontElement{labelitemiv}} geändert + werden. In der Voreinstellung verwenden diese alle die Schrifteinstellung + für Element + \FontElement{itemizelabel}\important{\FontElement{itemizelabel}}. Lediglich + Element \FontElement{labelitemii} verwendet zusätzlich + \Macro{bfseries}. Die Voreinstellung von \FontElement{itemizelabel} selbst + ist \Macro{normalfont}. Die einzelnen Stichpunkte der Umgebung werden mit + \Macro{item} eingeleitet.% \IfThisCommonFirstRun{\iftrue}{% \ In \autoref{sec:maincls.lists} auf \PageRefxmpl{maincls.env.itemize} finden Sie ein Beispiel für die Anwendung.% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-textmarkup.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-textmarkup.tex index b3272f66b15..1ffb67d699b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-textmarkup.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-textmarkup.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-textmarkup.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % common-textmarkup.tex -% Copyright (c) Markus Kohm, 2001-2019 +% Copyright (c) Markus Kohm, 2001-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{common-textmarkup.tex} - [$Date: 2019-12-02 09:50:10 +0100 (Mon, 02 Dec 2019) $ + [$Date: 2021-02-15 19:40:44 +0100 (Mon, 15 Feb 2021) $ KOMA-Script guide (common paragraphs)] \section{Textauszeichnungen} @@ -383,6 +383,12 @@ den jeweiligen Elementen.% \Class{scrartcl}} über dem Fußnotenapparat (siehe \autoref{sec:maincls.footnotes}, \DescPageRef{maincls.cmd.setfootnoterule})}% + \feentry{itemizelabel}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Grundeinstellung für die voreingestellten Aufzählungszeichen der + Umgebung \DescRef{\ThisCommonLabelBase.env.itemize} (siehe + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% \feentry{labelinglabel}{% Label, also das optionale Argument der \DescRef{\ThisCommonLabelBase.cmd.item.labeling}-Anweisung, und @@ -397,6 +403,30 @@ den jeweiligen Elementen.% nach dem Element \DescRef{\ThisCommonLabelBase.fontelement.labelinglabel} (siehe \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.labeling})}% + \feentry{labelitemi}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Schriftart für die Verwendung in der Definition des Aufzählungszeichens + \DescRef{\ThisCommonLabelBase.cmd.labelitemi} (siehe + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% + \feentry{labelitemii}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Schriftart für die Verwendung in der Definition des Aufzählungszeichens + \DescRef{\ThisCommonLabelBase.cmd.labelitemii} (siehe + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% + \feentry{labelitemiii}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Schriftart für die Verwendung in der Definition des Aufzählungszeichens + \DescRef{\ThisCommonLabelBase.cmd.labelitemiii} (siehe + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% + \feentry{labelitemiv}{% + \ChangedAt{v3.33}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Schriftart für die Verwendung in der Definition des Aufzählungszeichens + \DescRef{\ThisCommonLabelBase.cmd.labelitemiv} (siehe + \autoref{sec:maincls.lists}, \DescPageRef{maincls.env.itemize})}% \feentry{minisec}{% mit \DescRef{\ThisCommonLabelBase.cmd.minisec} gesetzte Überschrift (siehe \autoref{sec:maincls.structure} ab @@ -600,6 +630,11 @@ den jeweiligen Elementen.% \feentry{fromrule}{Linie im Absender im Briefkopf; gedacht für Farbänderungen (\autoref{sec:scrlttr2.firstpage}, \DescPageRef{scrlttr2.option.fromrule})}% + \feentry{itemizelabel}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Grundeinstellung für die voreingestellten Aufzählungszeichen der + Umgebung \DescRef{\ThisCommonLabelBase.env.itemize} (siehe + \autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.itemize})}% \feentry{labelinglabel}{% Label, also das optionale Argument der \DescRef{\ThisCommonLabelBase.cmd.item.labeling}-Anweisung, und @@ -616,6 +651,30 @@ den jeweiligen Elementen.% \DescRef{\ThisCommonLabelBase.fontelement.labelinglabel} (\autoref{sec:scrlttr2.lists}, \DescPageRef{scrlttr2.env.labeling})}% + \feentry{labelitemi}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Schriftart für die Verwendung in der Definition des + Aufzählungszeichens \DescRef{\ThisCommonLabelBase.cmd.labelitemi} + (siehe \autoref{sec:scrlttr2.lists}, + \DescPageRef{scrlttr2.env.itemize})}% + \feentry{labelitemii}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Schriftart für die Verwendung in der Definition des + Aufzählungszeichens \DescRef{\ThisCommonLabelBase.cmd.labelitemii} + (siehe \autoref{sec:scrlttr2.lists}, + \DescPageRef{scrlttr2.env.itemize})}% + \feentry{labelitemiii}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Schriftart für die Verwendung in der Definition des + Aufzählungszeichens \DescRef{\ThisCommonLabelBase.cmd.labelitemiii} + (siehe \autoref{sec:scrlttr2.lists}, + \DescPageRef{scrlttr2.env.itemize})}% + \feentry{labelitemiv}{% + \ChangedAt{v3.33}{\Class{scrlttr2}}% + Schriftart für die Verwendung in der Definition des + Aufzählungszeichens \DescRef{\ThisCommonLabelBase.cmd.labelitemiv} + (siehe \autoref{sec:scrlttr2.lists}, + \DescPageRef{scrlttr2.env.itemize})}% \feentry{pagefoot}{% wird je nach Seitenstil nach \DescRef{\ThisCommonLabelBase.fontelement.pageheadfoot} auf den diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide.tex index 1699a73c406..85c0617f26b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide.tex @@ -1,6 +1,6 @@ % ====================================================================== % guide.tex -% Copyright (c) Markus Kohm, 2002-2018 +% Copyright (c) Markus Kohm, 2002-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % guide.tex -% Copyright (c) Markus Kohm, 2002-2018 +% Copyright (c) Markus Kohm, 2002-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -48,7 +48,7 @@ \documentclass{scrguide} \KOMAProvidesFile{guide.tex} - [$Date: 2018-12-22 17:30:41 +0100 (Sat, 22 Dec 2018) $ + [$Date: 2021-01-02 15:55:38 +0100 (Sat, 02 Jan 2021) $ KOMA-Script (guide main file)] \begin{document} @@ -122,7 +122,8 @@ \let\toclevel@chapter\toclevel@part \makeatother \printchangelog -\bibliography{\jobname} + +\printbibliography[prenote=bibpreamble] \GuideIndexSeeAlsos diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex index eeb86ad1e6f..a7647187f0d 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrjura.tex -% Copyright (c) Markus Kohm, 2011-2019 +% Copyright (c) Markus Kohm, 2011-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrjura.tex -% Copyright (c) Markus Kohm, 2011-2019 +% Copyright (c) Markus Kohm, 2011-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{scrjura.tex}% - [$Date: 2019-12-03 09:41:21 +0100 (Tue, 03 Dec 2019) $ + [$Date: 2021-02-25 13:15:44 +0100 (Thu, 25 Feb 2021) $ KOMA-Script guide (chapter: scrjura)] \chapter{Unterstützung für die Anwaltspraxis durch \Package{scrjura}} @@ -180,7 +180,7 @@ unterbrochen und durch den Beginn einer neuen Umgebung wird sozusagen die alte Umgebung fortgesetzt. Dabei sind allerdings keine Unterbrechungen innerhalb eines Paragraphen möglich. -Sollten Sie stattdessen Umgebungen für voneinander unabhängigen Verträgen +Sollten Sie stattdessen Umgebungen für voneinander unabhängige Verträgen innerhalb desselben Dokuments benötigen, so sei auf die Möglichkeit der Definition weiterer Vertragsumgebungen mit \DescRef{\LabelBase.cmd.DeclareNewJuraEnvironment} in diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex index 3486cf407b7..307ee14ed7b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrlttr2.tex -% Copyright (c) Markus Kohm, 2002-2019 +% Copyright (c) Markus Kohm, 2002-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrlttr2.tex -% Copyright (c) Markus Kohm, 2002-2019 +% Copyright (c) Markus Kohm, 2002-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2.tex}% - [$Date: 2019-12-03 09:41:21 +0100 (Tue, 03 Dec 2019) $ + [$Date: 2021-02-25 09:27:06 +0100 (Thu, 25 Feb 2021) $ KOMA-Script guide (chapter: scrlttr2)] \chapter{Briefe mit Klasse \Class{scrlttr2} oder Paket \Package{scrletter}} @@ -760,7 +760,7 @@ zu definieren, so wird dies mit einer Fehlermeldung quittiert.% \Macro{Ifplength}\Parameter{Pseudolänge}% \Parameter{Dann-Code}\Parameter{Sonst-Code} \end{Declaration} -Mit\ChangedAt{v3.27}{\Class{scrlttr2}\and \Class{scrletter}} dieser Anweisung +Mit\ChangedAt{v3.27}{\Class{scrlttr2}\and \Package{scrletter}} dieser Anweisung kann geprüft werden, ob eine \PName{Pseudolänge} definiert ist. Ist dies der Fall, so wird der \PName{Dann-Code} ausgeführt, anderenfalls wird der \PName{Sonst-Code} ausgeführt.% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls index 9eb3bf23d8a..a8d5e63c2a7 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls @@ -1,6 +1,6 @@ % ====================================================================== % scrguide.cls -% Copyright (c) Markus Kohm, 2005-2020 +% Copyright (c) Markus Kohm, 2005-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrguide.cls -% Copyright (c) Markus Kohm, 2005-2020 +% Copyright (c) Markus Kohm, 2005-2021 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -38,7 +38,7 @@ % \section{Identification} % % \begin{macrocode} -\ProvidesClass{scrguide}[2020/03/17 v1.23 internal KOMA-Script guide class] +\ProvidesClass{scrguide}[2021/02/11 v1.25 internal KOMA-Script guide class] % \end{macrocode} % % @@ -128,8 +128,25 @@ \expandafter\RequirePackage\expandafter[\languages]{babel}% \AtBeginDocument{% \typeout{TRACE: Current language is `\languagename`.}}% -\RequirePackage[fixlanguage]{babelbib} -\expandafter\selectbiblanguage\expandafter{\uselanguage} +% \end{macrocode} +% In future we should use biblatex instead of babelbib, but currently some +% things are still missing: +% \begin{itemize} +% \item prefix \texttt{CTAN://}, +% \item line breaks after the author (but not full \texttt{openbib} style like +% \texttt{block=nbpar}), +% \item removing language tag \texttt{ngerman} from output. +% \end{itemize} +% So currently we still use babelbib. +% \begin{macrocode} +\newif\ifusebabelbib\usebabelbibtrue % Should be deactivated soon +\ifusebabelbib + \RequirePackage[fixlanguage]{babelbib} + \newcommand*{\printbibliography}[1][]{\bibliography{\jobname}} +\else + \RequirePackage[backend=bibtex,style=alphabetic,block=ragged]{biblatex} + \DeclareFieldFormat{url}{\url{#1}} +\fi \RequirePackage{afterpage} \RequirePackage{makeidx} \RequirePackage{scrdate} @@ -593,12 +610,15 @@ % \end{macro} % % \begin{macro}{\File} +% \changes{v1.25}{2021/02/11}{usage of \cs{texorpdfstring}} % \begin{macro}{\Class} +% \changes{v1.25}{2021/02/11}{usage of \cs{texorpdfstring}} % \begin{macro}{\Package} +% \changes{v1.25}{2021/02/11}{usage of \cs{texorpdfstring}} % Some markup macros for files with special meanings. -\DeclareRobustCommand*{\File}[1]{\mbox{\texttt{#1}}} -\DeclareRobustCommand*{\Class}[1]{\mbox{\textsfrm{#1}}} -\DeclareRobustCommand*{\Package}[1]{\mbox{\textsfrm{#1}}} +\DeclareRobustCommand*{\File}[1]{\texorpdfstring{\mbox{\texttt{#1}}}{#1}} +\DeclareRobustCommand*{\Class}[1]{\texorpdfstring{\mbox{\textsfrm{#1}}}{#1}} +\DeclareRobustCommand*{\Package}[1]{\texorpdfstring{\mbox{\textsfrm{#1}}}{#1}} % \end{macro} % \end{macro} % \end{macro} @@ -645,12 +665,14 @@ % \end{macro} % % \begin{macro}{\Macro} +% \changes{v1.25}{2021/02/11}{usage of \cs{texorpdfstring}} % \begin{macro}{\Option} % \begin{macro}{\KOption} % \begin{macro}{\OptionValue} % \begin{macro}{\Environment} % \begin{macro}{\Counter} % \begin{macro}{\Length} +% \changes{v1.25}{2021/02/11}{usage of \cs{texorpdfstring}} % \begin{macro}{\PLength} % \changes{v1.17}{2019/10/24}{\cs{setplength} verschoben}%^^A % \begin{macro}{\FloatStyle} @@ -704,7 +726,9 @@ \kernel@ifstar {\@DescPageRef*}{\@DescPageRef\space}% } \newcommand*{\@DescPageRef}[2]{\expandafter\autopageref#1{\label@desc@prefix#2}} -\DeclareSpecialMarkup{\Macro}{\mbox{\texttt{\char`\\#1}}}{% +\DeclareSpecialMarkup{\Macro}{% + \texorpdfstring{\mbox{\texttt{\char`\\#1}}}{\textbackslash#1}% +}{% \par \settowidth{\leftskip}{\textMacro{#1}}% indent from left \hskip-\leftskip @@ -980,7 +1004,9 @@ \label{\label@desc@prefix\label@base.length.#2#1}% \endgroup } -\DeclareSpecialMarkup{\Length}{\mbox{\texttt{\char`\\#1}}}{% +\DeclareSpecialMarkup{\Length}{% + \texorpdfstring{\mbox{\texttt{\char`\\#1}}}{\textbackslash#1}% +}{% \par \leftskip\z@ \BeginIndex{Length}{#1}% index entry @@ -1222,9 +1248,18 @@ % \end{macro} % % \begin{macro}{\eTeX} -% This may already be defined. +% \changes{v1.25}{2021/02/16}{workaround for (temporary) changes in +% \textsf{hyperref}} +% This may already be defined. % \begin{macrocode} \providecommand*{\eTeX}{\ensuremath{\varepsilon}-\TeX} +\AtBeginDocument{% + \@ifundefined{textepsilon}{% + \@ifundefined{pdfstringdef}{}{% + \pdfstringdef{\textepsilon}{\ifHy@unicode\83\265\else e\fi}% + }%% + }{}% +} \providecommand*{\NTS}{% \leavevmode\hbox{$\cal N\kern-0.35em\lower0.5ex\hbox{$\cal T$}% \kern-0.2emS$}} @@ -2300,26 +2335,33 @@ KOMAScript \endcsname % % Use of a preamble and sime other usefull changes. % \begin{macrocode} -\AtBeginDocument{% - \setbibpreamble{\GuideBibPreamble\bigskip}% - \selectbiblanguage{\languagename}% - \bibliographystyle{babalpha-fl}% - \renewcommand*{\@openbib@code}{% - \setlength{\parsep}{0pt}% - \renewcommand*{\btxauthorcolon}[1]{:\par\nobreak}% - \renewcommand*{\btxurlfont}{\par\nobreak\url}% - \raggedright - }% -} +\ifusebabelbib + \AtBeginDocument{% + \setbibpreamble{\GuideBibPreamble\bigskip}% + \bibliographystyle{babalpha-fl}% + \renewcommand*{\@openbib@code}{% + \setlength{\parsep}{0pt}% + \renewcommand*{\btxauthorcolon}[1]{:\par\nobreak}% + \renewcommand*{\btxurlfont}{\par\nobreak\url}% + \raggedright + }% + } % \end{macrocode} % % The generated argument of thebibliography is to short: % \begin{macrocode} -\newcommand*{\OrigTheBibliography}{} -\let\OrigTheBibliography\thebibliography -\renewcommand*{\thebibliography}[1]{% - \OrigTheBibliography{XXXX99}% -} + \newcommand*{\OrigTheBibliography}{} + \let\OrigTheBibliography\thebibliography + \renewcommand*{\thebibliography}[1]{% + \selectbiblanguage{\languagename}% + \OrigTheBibliography{XXXX99}% + } +\else + \AtBeginDocument{% + \defbibnote{bibpreamble}{\GuideBibPreamble}% + }% + \addbibresource{guide.bib} +\fi % \end{macrocode} % % diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html index 38ca39718f5..641fd180a0d 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html @@ -19,398 +19,398 @@

Optionen

Anweisungen

Umgebungen

Längen

Pseudolängen

Variablen

Seitenstile

Zähler

Stile für das float-Paket

Options

Commands

Environments

Lengths

Pseudolengths

Variables

Page Styles

Counter

Styles for the float Package