diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrartcl.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrartcl.cls | 219 |
1 files changed, 164 insertions, 55 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index b0135bc7d88..342c03e23be 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -52,7 +52,7 @@ %% scrkernel-listsandtabulars.dtx (with options: `class,article,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] +%% Copyright (c) 1994-2022 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3920 2022-07-04 08:01:38Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3962 2022-10-12 06:33:06Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/07/04 v3.37 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,7 +121,7 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2022/07/04 v3.37 KOMA-Script + 2022/10/12 v3.38 KOMA-Script document class (\ClassName)% ] %%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ @@ -130,7 +130,7 @@ %%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2022/07/04 v3.37 KOMA-Script + 2022/10/12 v3.38 KOMA-Script ] \addtotoclist[ToC]{toc} \Ifstr{\ext@toc}{toc}{}{% @@ -140,7 +140,7 @@ } %%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -201,7 +201,7 @@ \newcommand*{\size@subparagraph}{} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3896 2022-06-21 09:06:07Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -285,11 +285,12 @@ \@namedef{scr@v@3.34}{18} \@namedef{scr@v@3.35}{19} \@namedef{scr@v@3.36}{20} -\@namedef{scr@v@3.37 BETA}{20} +\@namedef{scr@v@3.37}{20} +\@namedef{scr@v@3.38}{20} \@namedef{scr@v@last}{20} %%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3896 2022-06-21 09:06:07Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -438,7 +439,7 @@ } %%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -476,6 +477,31 @@ \@defaultunits\@tempdima#1pt\relax\@nnil \edef\@ptsize{#1}% }{% + \ifvmode\else + \par + \ClassError{\KOMAClassName}{% + Option `fontsize' inside paragraph not allowed% + }{% + Option `fontsize' has been designed to change the base font size of + a\MessageBreak + document. It has not been made to change the current font + size. Moreover\MessageBreak + using it inside a paragraph mostly will not have the intended result, + because\MessageBreak + TeX always uses the setting of `\string\baselineskip' and other + parameters from the\MessageBreak + end of a paragraph for the whole paragraph. Therefore using option + `fontsize'\MessageBreak + in TeX's horizontal mode does not make sense and is not + permitted.\MessageBreak + You should use font size commands like `\string\Huge'…`\string\tiny' + or `\string\fontsize' here.\MessageBreak + See a LaTeX introduction for more information.\MessageBreak + But maybe you've just forgotten to make a paragraph. So if you'd + continue,\MessageBreak + I'll add `\expandafter\string\csname par\endcsname'.% + }% + \fi \expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil \edef\@tempa{#1}% \setlength{\@tempdimb}{\@tempdima}% @@ -854,7 +880,7 @@ \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -947,26 +973,28 @@ \RequirePackage{bookmark}% \fi }% - \ifx\@beginmainauxhook\relax - \else - \if@filesw - \ClassWarning{\KOMAClassName}{% - seems someone has broken package `auxhook'.\MessageBreak - Usually this happens, if `auxhook' is loaded or used\MessageBreak - implicitly or explicitly by patching - \string\document% - \scr@ifundefinedorrelax{AtEndPreamble}{}{% - \MessageBreak - or via etoolbox command \string\AtEndPreamble% - }.\MessageBreak - Trying an emergency workaround.\MessageBreak - You can avoid this warning adding:\MessageBreak - \space\space\string\usepackage{auxhook}\MessageBreak - before \string\begin{document}% - }% - \@beginmainauxhook + \@ifpackagelater{hyperref}{2022/09/22}{}{% + \ifx\@beginmainauxhook\relax + \else + \if@filesw + \ClassWarning{\KOMAClassName}{% + seems someone has broken package `auxhook'.\MessageBreak + Usually this happens, if `auxhook' is loaded or used\MessageBreak + implicitly or explicitly by patching + \string\document% + \scr@ifundefinedorrelax{AtEndPreamble}{}{% + \MessageBreak + or via etoolbox command \string\AtEndPreamble% + }.\MessageBreak + Trying an emergency workaround.\MessageBreak + You can avoid this warning adding:\MessageBreak + \space\space\string\usepackage{auxhook}\MessageBreak + before \string\begin{document}% + }% + \@beginmainauxhook + \fi \fi - \fi + }% \fi }% }% @@ -1173,7 +1201,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1868,7 +1896,7 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ @@ -1878,7 +1906,7 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3896 2022-06-21 09:06:07Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ %%% (run: body) \AtBeginDocument{% \begingroup @@ -1927,7 +1955,7 @@ }% \endgroup } -%%% From File: $Id: scrkernel-fonts.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1992,7 +2020,7 @@ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}% \fi \setlength{\belowdisplayskip}{\abovedisplayskip}% - \edef\normalsize{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\normalsize {\the\@tempdima}{\the\@tempdimb}% \abovedisplayskip \the\abovedisplayskip @@ -2001,6 +2029,8 @@ \belowdisplayshortskip \the\belowdisplayshortskip \let\noexpand\@listi\noexpand\@listI }% + \let\normalsize\@undefined + \expandafter\DeclareRobustCommand\expandafter\normalsize\expandafter{\reserved@a}% \setlength{\@tempdima}{0.9125\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2017,7 +2047,7 @@ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}% \fi \setlength{\belowdisplayskip}{\abovedisplayskip}% - \edef\small{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\small {\the\@tempdima}{\the\@tempdimb}% \abovedisplayskip \the\abovedisplayskip @@ -2026,6 +2056,8 @@ \belowdisplayshortskip \the\belowdisplayshortskip \let\noexpand\@listi\noexpand\@listi@small }% + \let\small\@undefined + \expandafter\DeclareRobustCommand\expandafter\small\expandafter{\reserved@a}% \setlength{\@tempdima}{.83334\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2042,7 +2074,7 @@ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}% \fi \setlength{\belowdisplayskip}{\abovedisplayskip}% - \edef\footnotesize{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\footnotesize {\the\@tempdima}{\the\@tempdimb}% \abovedisplayskip \the\abovedisplayskip @@ -2051,48 +2083,64 @@ \belowdisplayshortskip \the\belowdisplayshortskip \let\noexpand\@listi\noexpand\@listi@footnotesize }% + \let\footnotesize\@undefined + \expandafter\DeclareRobustCommand\expandafter\footnotesize\expandafter{\reserved@a}% \setlength{\@tempdima}{.66667\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\scriptsize{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\scriptsize {\the\@tempdima}{\the\@tempdimb}% }% + \let\scriptsize\@undefined + \expandafter\DeclareRobustCommand\expandafter\scriptsize\expandafter{\reserved@a}% \setlength{\@tempdima}{.5\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\tiny{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\tiny {\the\@tempdima}{\the\@tempdimb}% }% + \let\tiny\@undefined + \expandafter\DeclareRobustCommand\expandafter\tiny\expandafter{\reserved@a}% \setlength{\@tempdima}{1.2\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\large{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\large {\the\@tempdima}{\the\@tempdimb}% }% + \let\large\@undefined + \expandafter\DeclareRobustCommand\expandafter\large\expandafter{\reserved@a}% \setlength{\@tempdima}{1.44\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\Large{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\Large {\the\@tempdima}{\the\@tempdimb}% }% + \let\Large\@undefined + \expandafter\DeclareRobustCommand\expandafter\Large\expandafter{\reserved@a}% \setlength{\@tempdima}{1.728\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\LARGE{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\LARGE {\the\@tempdima}{\the\@tempdimb}% }% + \let\LARGE\@undefined + \expandafter\DeclareRobustCommand\expandafter\LARGE\expandafter{\reserved@a}% \setlength{\@tempdima}{2.074\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\huge{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\huge {\the\@tempdima}{\the\@tempdimb}% }% + \let\huge\@undefined + \expandafter\DeclareRobustCommand\expandafter\huge\expandafter{\reserved@a}% \setlength{\@tempdima}{2.488\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\Huge{% + \edef\reserved@a{% \noexpand\@setfontsize\noexpand\Huge {\the\@tempdima}{\the\@tempdimb}% }% + \let\Huge\@undefined + \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved@a}% \normalsize \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2322,10 +2370,14 @@ \ifnum\scr@defineobsoletefonts>\tw@ \DeclareOldFontCommand{#1}{#2}{#3}% \else - \DeclareOldFontCommand{#1}{% - \scr@ErrorWarningInfo{#1}{#2}#2% - }{% - \scr@ErrorWarningInfo{#1}{#3}#3% + \AtBeginDocument{% + \ifdefined#1\else + \DeclareOldFontCommand{#1}{% + \scr@ErrorWarningInfo{#1}{#2}#2% + }{% + \scr@ErrorWarningInfo{#1}{#3}#3% + }% + \fi }% \fi \fi @@ -3096,7 +3148,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ %%% (run: body) \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% @@ -3791,6 +3843,17 @@ \fi \fi }% + \DeclareSectionCommandStyleOption{#1}{#2:}{% + \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{% + \ifscr@dsc@expandtopt + \setlength{\@tempskipa}{\@nameuse{#3##1#4}}% + \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{\the\@tempskipa}% + \else + \@namedef{#3\scr@dsc@current#4}{\@nameuse{#3##1#4}}% + \fi + \FamilyKeyStateProcessed + }% + }% } \newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{% \DeclareSectionCommandStyleOption{#1}{#2}{% @@ -3801,6 +3864,17 @@ \expandafter\let\csname #3\scr@dsc@current#4\endcsname\reserved@a \fi }% + \DeclareSectionCommandStyleOption{#1}{#2:}{% + \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{% + \ifscr@dsc@expandtopt + \@tempcnta=\@nameuse{#3##1#4}% + \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{\the\@tempcnta}% + \else + \@namedef{#3\scr@dsc@current#4}{\@nameuse{#3##1#4}}% + \fi + \FamilyKeyStateProcessed + }% + }% } \newcommand*{\DeclareSectionCommandStyleFontOption}[4]{% \DeclareSectionCommandStyleOption{#1}{#2}{% @@ -3811,6 +3885,16 @@ }{#3\scr@dsc@current#4}{##1}% \FamilyKeyStateProcessed }% + \DeclareSectionCommandStyleOption{#1}{#2:}{% + \IfExistskomafont{#3##1#4}{% + \IfExistskomafont{#3\scr@dsc@current#4}{% + \setkomafont + }{% + \newkomafont + }{#3\scr@dsc@current#4}{\usekomafont{#3##1#4}}% + \FamilyKeyStateProcessed + }{\FamilyKeyStateUnknownValue}% + }% } \newcommand*{\DeclareSectionCommandStyleFuzzyOption}[5]{% \DeclareSectionCommandStyleOption{#1}{#2}{% @@ -3831,6 +3915,19 @@ }{}% \fi }% + \DeclareSectionCommandStyleOption{#1}{#2:}{% + \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{% + \ifscr@dsc@expandtopt + \expandafter\let\csname #3\scr@dsc@current#4\expandafter\endcsname + \csname #3##1#4\endcsname + \else + \expandafter\def\csname #3\scr@dsc@current#4\endcsname{% + \@nameuse{#3##1#4}% + }% + \fi + \FamilyKeyStateProcessed + }% + }% } \newcommand*{\scr@dsc@style@section@options}{} \DeclareSectionCommandStyleLengthOption{section} @@ -5357,7 +5454,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3894 2022-06-19 10:25:46Z kohm $ +%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -5368,7 +5465,7 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ %%% (run: body) \newlength{\abovecaptionskip} \newlength{\belowcaptionskip} @@ -5384,6 +5481,8 @@ \newcommand*{\scap@move}{\z@} \newif\ifscap@alt \newcommand*{\scap@currentlabel}{} +\newcommand*{\scap@currentlabelname}{} +\newcommand*{\scap@currentHref}{} \newcommand*{\@captionbeside}{} \long\def\@captionbeside[#1]#2{% \kernel@ifnextchar [%] @@ -5469,7 +5568,11 @@ \if l\@tempa \rlap{% \parbox[\scap@valign]{\@tempdimb}{\scap@caption - \global\let\scap@currentlabel\@currentlabel}% + \global\let\scap@currentlabel\@currentlabel + \global\let\scap@currentcounter\@currentcounter + \global\let\scap@currentlabelname\@currentlabelname + \global\let\scap@currentHref\@currentHref + }% \nobreak\hskip\columnsep \parbox[\scap@valign]{\wd\c@pti@nb@sid@b@x}{\usebox\c@pti@nb@sid@b@x}% }% @@ -5478,12 +5581,18 @@ \parbox[\scap@valign]{\wd\c@pti@nb@sid@b@x}{\usebox\c@pti@nb@sid@b@x}% \nobreak\hskip\columnsep \parbox[\scap@valign]{\@tempdimb}{\scap@caption - \global\let\scap@currentlabel\@currentlabel}% + \global\let\scap@currentlabel\@currentlabel + \global\let\scap@currentcounter\@currentcounter + \global\let\scap@currentlabelname\@currentlabelname + \global\let\scap@currentHref\@currentHref + }% }% \fi \par - \aftergroup\let\aftergroup\@currentlabel - \aftergroup\scap@currentlabel + \aftergroup\let\aftergroup\@currentlabel\aftergroup\scap@currentlabel + \aftergroup\let\aftergroup\@currentcounter\aftergroup\scap@currentcounter + \aftergroup\let\aftergroup\@currentlabelname\aftergroup\scap@currentlabelname + \aftergroup\let\aftergroup\@currentHref\aftergroup\scap@currentHref } \newcommand*\capfont{\normalfont\normalcolor} \newcommand*\caplabelfont{\normalfont\normalcolor} |