diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-11 21:26:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-11 21:26:48 +0000 |
commit | 39c10427f8eee057dc28928380060a585e1e017b (patch) | |
tree | 6750074338d5e6b808cfca3671e2ab9763c328ae /Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx | |
parent | a49931ca8756327265b8929a7a147045bf2b3506 (diff) |
koma-script (11may16)
git-svn-id: svn://tug.org/texlive/trunk@41038 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx | 184 |
1 files changed, 143 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx index 90ce6819b17..9593eb7a133 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx @@ -1,8 +1,8 @@ -% \CheckSum{3237} +% \CheckSum{3296} % \iffalse meta-comment % ====================================================================== % scrkernel-fonts.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-fonts.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,12 +55,12 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-08-24 11:30:25 +0200 (Mon, 24 Aug 2015) $ + \filedate$Date: 2016-04-12 12:31:07 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1827 $ \edef\reserved@a{% @@ -1126,12 +1126,14 @@ \@@@generatefontfile }{% % \end{macrocode} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Das zweite Argument ist optional. Ist es angegeben, so gibt es den % gewünschten Zeilenabstand an. Ist es nicht angegeben, so wird der % Zeilenabstand |\changefontsized| überlassen. Das dritte Argument ist % schließlich die gewünschte Schriftgröße. % \begin{macrocode} - \@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}% + \kernel@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}% }% } % \end{macrocode} @@ -1549,59 +1551,159 @@ }% } %</!extend> +%</class|extend> +%</body> % \end{macrocode} % % % \subsection{"`Alte"' Font-Auswahlbefehle} % +% \begin{option}{enabledeprecatedfontcommands} +% \changes{v3.20}{2015/10/14}{neue (veraltete) Option}^^A +% Diese Option ist bereits bei ihrer Definition veraltet. Sie stellt quasi die +% nächste Eskalation für die veralteten Font-Auswahlbefehle dar. Man kann mit +% ihrer Hilfe notfalls noch einmal die alten Befehle zurück holen. Dabei wird +% in der Voreinstellung weiterhin eine Warnung ausgegeben. +% \begin{macro}{\scr@defineobsoletefonts} +% \changes{v3.20}{2015/10/14}{neue (veraltete) Anweisung (intern)}^^A +% Über diese Anweisung wird eingestellt, ob die veralteten Befehle mit +% Fehlermeldung, Warnung, Info oder gar nicht gemeldet werden. +% Negative Werte bedeuten, dass die Befehle nicht definiert werden. Null steht +% für interne Fehlermeldung. Eins ist eine Warnung. Zwei ist eine Info und +% darüber hinaus werden die Befehle einfach definiert. Voreingestellt ist +% derzeit noch Null. In naher Zukunft wird das aber -1 werden. +% \begin{macrocode} +%<*option> +%<*class> +\DeclareOption{enabledeprecatedfontcommands}{% + \ClassWarningNoLine{\KOMAClassName}{% + deprecated option `enabledeprecatedfontcommands'.\MessageBreak + Note, that this option was already depreacted when\MessageBreak + it has been defined. Support for old font commands\MessageBreak + has been removed from KOMA-Script more than one\MessageBreak + decade ago. It is not recommended to use them any\MessageBreak + longer. Therefore usage of this class option also\MessageBreak + is not recommended% + }% + \let\scr@defineobsoletefonts\@ne +} +\scr@ifundefinedorrelax{scr@defineobsoletefonts}{% + \let\scr@defineobsoletefonts\z@ +}{} +\BeforePackage{tex4ht}{% + \let\scr@defineobsoletefonts\thr@@ +} +%</class> +%</option> +% \end{macrocode} +% \end{macro}^^A \scr@degineobsoletefonts +% \end{option}^^A enabledeprecatedfontscommands +% % \begin{macro}{\scr@DeclareOldFontCommand} % \changes{v3.12}{2013/10/31}{neu}^^A +% \changes{v3.20}{2015/10/14}{veraltet eskaliert}^^A % Diese Anweisung arbeitet prinzipiell wie die \LaTeX-Kern-Anweisung % \cs{DeclareOldFontCommand}, wirft aber zusätzlich mit Warnungen um sich, um % dem Anwender die Verwendung der alten Befehle zu versauern. % \begin{macrocode} +%<*body> +%<*class|extend> %<*!extend> \newcommand*{\scr@DeclareOldFontCommand}[3]{% - \DeclareRobustCommand #1{\@fontswitch {% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated font command `\string#1'!\MessageBreak - You should note, that in 1994 font command `\string#1' has\MessageBreak - been defined for compatiblitiy to Script 2.0 only.\MessageBreak - Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak - shouldn't use such commands any longer and within\MessageBreak - KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak - See `fntguide.pdf' for more information about\MessageBreak - recommended font commands.\MessageBreak - Note also, that KOMA-Script will remove the definition\MessageBreak - of `\string#1' anytime until release of about version 3.20.\MessageBreak - But for now, KOMA-Script will replace deprecated - `\string#1'\MessageBreak - by `\detokenize{#2}'% - }% - #2% - }{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated font command `\string#1'!\MessageBreak - You should note, that in 1994 font command `\string#1' has\MessageBreak - been defined for compatiblitiy to Script 2.0 only.\MessageBreak - Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak - shouldn't use such commands any longer and within\MessageBreak - KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak - See `fntguide.pdf' for more information about\MessageBreak - recommended font commands.\MessageBreak - Note also, that KOMA-Script will remove the definition\MessageBreak - of `\string#1' anytime until release of about version 3.20.\MessageBreak - But for now, KOMA-Script will replace deprecated - `\string#1'\MessageBreak - by `\detokenize{#3}'% + \ifnum\scr@defineobsoletefonts<\z@\else + \ifnum\scr@defineobsoletefonts>\tw@ + \DeclareOldFontCommand{#1}{#2}{#3}% + \else + \DeclareOldFontCommand{#1}{% + \scr@ErrorWarningInfo{#1}{#2}#2% + }{% + \scr@ErrorWarningInfo{#1}{#3}#3% }% - #3% + \fi + \fi +} +% \end{macrocode} +% \begin{macro}{\scr@ErrorWarningInfo} +% \changes{v3.20}{2015/10/14}{neu (intern)}^^A +% \begin{macrocode} +\DeclareRobustCommand*{\scr@ErrorWarningInfo}[2]{% +% \end{macrocode} +% Wenn \cs{scr@defineobsoletefonts} Null ist, wird eine Fehlermeldung +% ausgegeben. +% \begin{macrocode} + \ifnum \scr@defineobsoletefonts=\z@ + \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{% + You should note that since 1994 LaTeX2e provides a new font selection + scheme\MessageBreak + called NFSS2 with several new, combinable font commands. New + KOMA-Script\MessageBreak + classes have defined the old font commands like `\string#1' + only for compatibility\MessageBreak + with old LaTeX 2.09 document styles of Script 2.0. Nevertheless, + these\MessageBreak + commands are deprecated and undocumented at least since + 2003. Since 2013\MessageBreak + KOMA-Script classes warn abouts soon removement of these deprecated + commands.\MessageBreak + Now, after two decades of LaTeX2e and NFSS2, these commands will not + work any\MessageBreak + more. If loading a package results in this error message, you should + contact\MessageBreak + the author of that package and ask him to replace the deprecated font + command\MessageBreak + `\string#1', e.g., by `\detokenize{#2}`. Otherwise you should + reconfigure\MessageBreak + or replace the package. If you have used the old font command + `\string#1' yourself,\MessageBreak + you should replace it, e.g., by `\detokenize{#2}'.\MessageBreak + To make it work for now, you can use the already also deprecated class + option\MessageBreak + `enabledeprecatedfontcommands'.% }% - }% + \else + \ifcase \scr@defineobsoletefonts +% \end{macrocode} +% Bei Eins gibt es eine Warnung: +% \begin{macrocode} + \or + \expandafter\ClassWarning +% \end{macrocode} +% Bei Zwei gibt es eine Info: +% \begin{macrocode} + \or + \expandafter\ClassInfo +% \end{macrocode} +% Sonst gibt es nichts: +% \begin{macrocode} + \else + \expandafter\@gobbletwo + \fi + {\KOMAClassName}{deprecated old font command `\string#1' used.\MessageBreak + You should note, that since 1994 LaTeX2e provides a\MessageBreak + new font selection scheme called NFSS2 with several\MessageBreak + new, combinable font commands. New KOMA-Script classes\MessageBreak + have defined the old font commands like `\string#1' only for\MessageBreak + compatibility with LaTeX 2.09 document styles of\MessageBreak + Script 2.0. These commands are deprecated and\MessageBreak + undocumented at least since 2003. Since 2013,\MessageBreak + KOMA-Script classes warn about soon removement of\MessageBreak + these deprecated commands. Now, after two decades of\MessageBreak + LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak + not work any longer. If loading a package results in\MessageBreak + this message you should contact the author of that\MessageBreak + package and ask him to replace the depracted font\MessageBreak + command `\string#1', e.g., by `\detokenize{#2}'.\MessageBreak + Otherwise you should reconfigure or replace the\MessageBreak + package. If you have used the old font command\MessageBreak + `\string #1' yourself you should replace it, e.g., by\MessageBreak + `\detokenize{#2}'% + }% + \fi } %</!extend> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \scr@OldFontErrorWarningInfo +% \end{macro}^^A \scr@DeclareOldFontCommand % % \begin{macro}{\rm} % \changes{v3.12}{2013/10/13}{Anweisung ist veraltet}^^A |