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 | 115 |
1 files changed, 76 insertions, 39 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 fa4079ac055..eab08b90ca4 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx @@ -1,8 +1,7 @@ -% \CheckSum{721} % \iffalse meta-comment % ====================================================================== % scrkernel-paragraphs.dtx -% Copyright (c) Markus Kohm, 2002-2019 +% Copyright (c) Markus Kohm, 2002-2021 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +19,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-paragraphs.dtx -% 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. @@ -55,7 +54,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> @@ -63,7 +62,7 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2019-10-10 10:25:29 +0200 (Thu, 10 Oct 2019) $ + \filedate$Date: 2021-01-21 10:52:21 +0100 (Thu, 21 Jan 2021) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1872 $ \edef\reserved@a{% @@ -465,16 +464,52 @@ % \end{Length} % % \begin{macro}{\selectfont} -% \changes{v2.95}{2004/11/05}{neue Änderung}%^^A +% \changes{v3.33}{2021/01/21}{from \LaTeX{} 2021/01/05 use hook instead of +% patch} +% \begin{macrocode} +\IfLTXAtLeastTF{2021/01/05}{% + \AddToHook{selectfont}{\par@update}% + \AfterPackage{everysel}{% + \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% + \ClassError{\KOMAClassName}{% + incompatible `everysel' detected + }{% + You are using an old version of `everysel' in combination with a + LaTeX\MessageBreak + version >= 2021/01/05 and KOMA-Script >= 3.33. This combination + is\MessageBreak + not supported.\MessageBreak + You could switch back to an older LaTeX using package + `latexrelease'.\MessageBreak + But I recommend to update `everysel'% + }% + }% + }% + \AfterPackage{tracefnt}{% + \IfPackageAtLeastTF{tracefnt}{2020/12/22}{}{% + \ClassError{\KOMAClassName}{% + incompatible `tracefnt' detected + }{% + `tracefnt' is a LaTeX base package and therefore should be updated + together\MessageBreak + with LaTeX kernel. So this should never happen! Please check + your\MessageBreak + LaTeX installation% + }% + }% + }% +}{% +% \end{macrocode} +% \changes{v2.95}{2004/11/05}{neue Änderung} % Spätestens ab Version~3.0 soll die Möglichkeit bestehen, |\parskip|, % |\parindent| und |\parfillskip| mit der Schriftgröße automatisch % anzupassen. Dazu muss |\selectfont| entsprechend erweitert werden. % \begin{macro}{\scr@selectfont} -% \changes{v2.95}{2006/04/14}{neue Erweiterung}%^^A +% \changes{v2.95}{2006/04/14}{neue Erweiterung} % \changes{v3.10}{2010/09/28}{\textsf{everysel}-Behandlung korrigiert} % \changes{v3.10}{2010/09/28}{\textsf{tracefnt}-Behandlung hinzugefügt} % \begin{macro}{\scr@new@selectfont} -% \changes{v2.95}{2006/04/14}{neue Erweiterung}%^^A +% \changes{v2.95}{2006/04/14}{neue Erweiterung} % \changes{v3.10}{2010/09/28}{\textsf{everysel}-Behandlung korrigiert} % \changes{v3.10}{2010/09/28}{\textsf{tracefnt}-Behandlung hinzugefügt} % \changes{v3.10b}{2011/03/13}{\textsf{everysel} kann jetzt auch während @@ -482,51 +517,53 @@ % Damit das auch bei Verwendung des \textsf{everysel}-Pakets funktioniert, % wird hier zusätzliche Vorsorge getroffen. % \begin{macrocode} -\newcommand*{\scr@selectfont}{} -\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname -\BeforePackage{everysel}{% - \AtBeginDocument{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else - \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}% - \fi - \expandafter\let\csname selectfont \endcsname\scr@selectfont + \newcommand*{\scr@selectfont}{} + \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname + \BeforePackage{everysel}{% + \AtBeginDocument{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else + \ClassWarningNoLine{\KOMAClassName}{% + discard change of \string\selectfont}% + \fi + \expandafter\let\csname selectfont \endcsname\scr@selectfont + }% }% -} -\AfterPackage{everysel}{% - \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \AfterPackage{everysel}{% + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% % \end{macrocode} % Jetzt gibt es zwei Möglichkeiten: Entweder wurde ein \textsf{everysel} % verwendet, bei dem alles anders funktioniert, oder es wurde während % \cs{begin}\marg{document} geladen. In beiden Fällen versuchen wir einen % direkten Patch: % \begin{macrocode} - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont - \ClassWarningNoLine{\KOMAClassName}{% - \string\selectfont\space already changed}% - \else - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname - \fi - }{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% % \end{macrocode} % In diesem Fall muss hingegen indirekt gepatcht werden. % \begin{macrocode} - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% }% }% -} -\AfterPackage{tracefnt}{% - \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \AfterPackage{tracefnt}{% + \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + }% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} + \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} -\newcommand*{\scr@new@selectfont}{} -\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname % \end{macrocode} % \end{macro} % \end{macro} |