summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkpar.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkpar.dtx49
1 files changed, 32 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx b/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx
index 899b158dfd7..7f39e7e74d8 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{570}
+% \CheckSum{608}
% \iffalse meta-comment
% ======================================================================
% scrkpar.dtx
-% Copyright (c) Markus Kohm, 2002-2011
+% Copyright (c) Markus Kohm, 2002-2012
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkpar.dtx
-% Copyright (c) Markus Kohm, 2002-2011
+% Copyright (c) Markus Kohm, 2002-2012
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -58,7 +58,7 @@
%%% From File: scrkpar.dtx
%<*driver>
% \fi
-\ProvidesFile{scrkpar.dtx}[2010/12/14 v3.08 KOMA-Script (paragraphs)]
+\ProvidesFile{scrkpar.dtx}[2011/09/28 v3.10 KOMA-Script (paragraphs)]
% \iffalse
\documentclass[halfparskip-]{scrdoc}
\usepackage[english,ngerman]{babel}
@@ -404,26 +404,41 @@
% 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}
-% \begin{macro}{\scr@new@selectfont}
-% \changes{v2.95}{2006/04/14}{neue Erweiterung}
+% \begin{macro}{\scr@selectfont}
+% \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}
+% \changes{v3.10}{2010/09/28}{\textsf{everysel}-Behandlung korrigiert}
+% \changes{v3.10}{2010/09/28}{\textsf{tracefnt}-Behandlung hinzugefügt}
% Damit das auch bei Verwendung des \textsf{everysel}-Pakets funktioniert,
% wird hier zusätzliche Vorsorge getroffen.
% \begin{macrocode}
-\newcommand*{\scr@selectfont}{}\let\scr@selectfont\selectfont
+\newcommand*{\scr@selectfont}{}
+\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname
\BeforePackage{everysel}{%
- \ifx\selectfont\scr@new@selectfont\else
- \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}%
- \fi
- \let\selectfont\scr@selectfont
+ \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}{%
- \g@addto@macro\selectfont{\par@update}%
- \let\scr@new@selectfont\selectfont
+ \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}%
+ \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
}
-\g@addto@macro\selectfont{\par@update}
-\newcommand*{\scr@new@selectfont}{}\let\scr@new@selectfont\selectfont
+\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}