diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx | 77 |
1 files changed, 44 insertions, 33 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx index 6e3a43f3a1a..f2756ade065 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $ + \filedate$Date: 2022-11-16 08:25:23 +0100 (Mi, 16. Nov 2022) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3874 $ + \filerevision$Revision: 3998 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-paragraphs.dtx}% @@ -89,6 +89,8 @@ % \changes{v3.17}{2015/03/10}{support for internal option value storage} % \changes{v3.19}{2015/07/29}{\cs{par@update} should not reset itself to % \cs{default@par@update} in the document preamble} +% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of +% option storage commands} % \begin{macro}{\f@parindent} % \changes{v2.95}{2004/11/05}{added} % \begin{macro}{\f@parskip,\f@parfillskip} @@ -161,16 +163,16 @@ \if@atdocument\let\par@update\default@par@update\fi \par@updaterelative }% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half*}% } \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} @@ -276,6 +278,8 @@ % \changes{v3.17}{2015/03/10}{using value storage} % \changes{v3.25}{2017/09/27}{typo fix in \cs{FamilyKeyStateUnknownValue}} % \changes{v3.26b}{2019/02/01}{\cs{baselineskip} replaced by 1\cs{baselineskip}} +% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of +% option storage commands} % \begin{option}{parindent,parskip-,parskip+,parskip*, % halfparskip,halfparskip-,halfparskip+,halfparskip*} % \changes{v2.8i}{2001/07/22}{added} @@ -283,6 +287,7 @@ % \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by % \cs{PackageInfoNoLine}} % \changes{v3.01a}{2008/11/20}{deprecated} +% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4} % Originally we have had nine options for all the paragraph indent and skip % settings. Using \pkg*{scrbase} we have only one option with additional % settings for relative and absolute values and paragraph indent without glue @@ -310,66 +315,66 @@ \ifcase\number\@tempa% 0 \endgroup \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{never}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{false}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 2 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 4 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 6 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 8 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 10 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{relative}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -383,9 +388,9 @@ }% \or%11 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -405,6 +410,7 @@ \FamilyKeyStateUnknownValue \fi } +%<*!v4> \KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-} \KOMA@DeclareDeprecatedOption{parskip+}{parskip=full+} \KOMA@DeclareDeprecatedOption{parskip*}{parskip=full*} @@ -413,8 +419,9 @@ \KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} \KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} +%</!v4> +\KOMA@kav@add{\KOMAClassFileName}{parskip}{false} +\KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute} %</option> % \end{macrocode} % \end{option}^^A parindent … halfparskip* @@ -659,8 +666,12 @@ %</class> %<*class|clo> %<*body|10pt|11pt|12pt> -%<10pt|11pt|12pt>\@ifundefined{@list@extra}{}{% -%<10pt|11pt|12pt> \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi +%<*10pt|11pt|12pt> +\@ifundefined{@list@extra}{}{% + \scr@ifundefinedorrelax{scr@v@is@ge}{\par@updaterelative}{% + \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi + }% +%</10pt|11pt|12pt> \l@addto@macro{\@listi}{\@list@extra}% \let\@listI=\@listi \l@addto@macro{\@listii}{\@list@extra}% |