diff options
author | Karl Berry <karl@freefriends.org> | 2023-04-17 19:57:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-04-17 19:57:41 +0000 |
commit | 0f04be16f7c95e84cd17884ce759b58426c407eb (patch) | |
tree | 013394ce9db9673010895d238eeb3dd81bfa4cb6 /Master/texmf-dist/source/latex/koma-script/scrhack.dtx | |
parent | 8fe5055d95cdf4749ce6010ab87f031d5bf685d4 (diff) |
koma-script (17apr23)
git-svn-id: svn://tug.org/texlive/trunk@66870 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrhack.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrhack.dtx | 106 |
1 files changed, 86 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrhack.dtx b/Master/texmf-dist/source/latex/koma-script/scrhack.dtx index a656ed6fa30..3d4f0358a27 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrhack.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrhack.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrhack.dtx -% Copyright (c) Markus Kohm, 2008-2022 +% Copyright (c) Markus Kohm, 2008-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -21,7 +21,7 @@ % To create `scrhack.sty' run `tex scrhack.dtx'. Using LaTeX instead % of TeX would generate the implementation documentation. % ====================================================================== -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ %<package&identify>%%% using: package,identify %<package&option>%%% using: package,option %<package&body>%%% using: package,body @@ -30,9 +30,9 @@ \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-09 14:11:14 +0200 (Do, 09. Jun 2022) $ + \filedate$Date: 2023-03-15 17:09:39 +0100 (Mi, 15. Mär 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3889 $ + \filerevision$Revision: 4015 $ \endgroup \ProvidesFile{scrhack.dtx}[\filedate\space\filerevision\space %</dtx> @@ -286,6 +286,8 @@ % \pkg{hyperref}} % \changes{v3.18}{2015/05/22}{newer versions of \KOMAScript{} classes also % deactivate the the hack} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA@key} +% and \cs{KOMAExecuteOptions} removed} % This is a little bit tricky, because \pkg{hyperref} loads the driver file % via \cs{AtEndOfPackage} and the hack cannot be loaded before loading the % driver file. Using \cs{AfterPackage*} would not be good enough therefore, @@ -301,7 +303,7 @@ \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak detection of KOMA-Script class, that doesn't\MessageBreak need that hack,}% - \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}% + \KOMAExecuteOptions[scrhack.sty]{hyperref=false}% }% } \AfterPackage*{hyperref}{% @@ -310,10 +312,10 @@ \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak detection of hyperref version, that doesn't\MessageBreak need that hack,}% - \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}% + \KOMAExecuteOptions[scrhack.sty]{hyperref=false}% }{% \AtEndOfPackage{% - \KOMA@key[.scrhack.sty]{hyperref}{% + \KOMA@key[scrhack.sty]{hyperref}{% \PackageWarning{scrhack}{option `hyperref=#1' ignored}% \FamilyKeyStateProcessed }% @@ -458,6 +460,8 @@ % \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyStateProcessed}} % \changes{v3.17}{2015/03/09}{using \cs{KOMAExecuteOptions}} % \changes{v3.34}{2021/06/03}{deactivation of the \pkg{float} hack} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA@key} +% removed} % \begin{macrocode} %<*package&option> \KOMA@ifkey{floatrow}{@scrhack@floatrow} @@ -467,7 +471,7 @@ \AfterPackage*{floatrow}{% \KOMAoptions{float=false}% \PackageInfo{scrhack}{option `float' deactivated}% - \KOMA@key[.scrhack.sty]{floatrow}{% + \KOMA@key[scrhack.sty]{floatrow}{% \PackageWarning{scrhack}{option `floatrow' ignored}% \FamilyKeyStateProcessed }% @@ -594,6 +598,8 @@ % \begin{option}{float} % \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyStateProcessed}} % \changes{v3.17}{2015/03/09}{using \cs{KOMAExecuteOptions}} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA@key} +% removed} % \begin{macrocode} %<*package&option> \KOMA@ifkey{float}{@scrhack@float}% @@ -601,7 +607,7 @@ %</package&option> %<*package&body> \AfterPackage*{float}{% - \KOMA@key[.scrhack.sty]{float}{% + \KOMA@key[scrhack.sty]{float}{% \PackageWarning{scrhack}{option `float' ignored}% \FamilyKeyStateProcessed }% @@ -737,6 +743,8 @@ % \begin{option}{listings} % \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyStateProcessed}} % \changes{v3.17}{2015/03/09}{using \cs{KOMAExecuteOptions}} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA@key} +% removed} % \begin{macrocode} %<*package&option> \KOMA@ifkey{listings}{@scrhack@listings} @@ -744,7 +752,7 @@ %</package&option> %<*package&body> \AfterPackage*{listings}{% - \KOMA@key[.scrhack.sty]{listings}{% + \KOMA@key[scrhack.sty]{listings}{% \PackageWarning{scrhack}{option `listings' ignored}% \FamilyKeyStateProcessed }% @@ -870,6 +878,8 @@ % % \begin{option}{nomencl} % \changes{v3.23}{2017/03/31}{added} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA@key} +% removed} % \begin{macrocode} %<*package&option> \RequirePackage{xpatch}% @@ -878,7 +888,7 @@ %</package&option> %<*package&body> \AfterPackage*{nomencl}{% - \KOMA@key[.scrhack.sty]{nomencl}{% + \KOMA@key[scrhack.sty]{nomencl}{% \PackageWarning{scrhack}{option `nomencl' ignored}% \FamilyKeyStateProcessed }% @@ -1083,6 +1093,8 @@ % % \begin{option}{setspace} % \changes{v3.17}{2015/04/16}{added} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA@key} +% removed} % \begin{macrocode} %<*package&option> \KOMA@ifkey{setspace}{@scrhack@setspace} @@ -1090,7 +1102,7 @@ %</package&option> %<*package&body> \AfterPackage*{setspace}{% - \KOMA@key[.scrhack.sty]{setspace}{% + \KOMA@key[scrhack.sty]{setspace}{% \PackageWarning{scrhack}{option `setspace' ignored}% \FamilyKeyStateProcessed }% @@ -1125,9 +1137,34 @@ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% }% }{% - \PackageWarning{scrhack}{unknown \string\onehalfspacing\space - definition found!\MessageBreak - Maybe you are using a unsupported setpace version}% +% \end{macrocode} +% \changes{v3.39}{2023/03/15}{support for \pkg{setspace} 6.7b added} +% \begin{macrocode} + \scr@ifexpected{\onehalfspacing}{% + \long\def\onehalfspacing{% + \setstretch{1.25}% default +% DPC 6.7b guard \@ptsize + \ifx\@ptsize\@undefined\else + \ifcase \@ptsize \relax % 10pt + \setstretch {1.25}% + \or % 11pt + \setstretch {1.213}% + \or % 12pt + \setstretch {1.241}% + \fi + \fi + }% + }{% + \renewcommand*{\onehalfspacing}{% + \@tempdima=\dimexpr (\f@size pt)*1500/ + (\dimexpr \f@baselineskip\relax)*\p@/1000\relax + \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% + }% + }{% + \PackageWarning{scrhack}{unknown \string\onehalfspacing\space + definition found!\MessageBreak + Maybe you are using a unsupported setpace version}% + }% } % \end{macrocode} % \end{command} @@ -1154,9 +1191,34 @@ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% }% }{% - \PackageWarning{scrhack}{unknown \string\doublespacing\space - definition found!\MessageBreak - Maybe you are using a unsupported setpace version}% +% \end{macrocode} +% \changes{v3.39}{2023/03/15}{support for \pkg{setspace} 6.7b added} +% \begin{macrocode} + \scr@ifexpected{\doublespacing}{% + \long\def\doublespacing{% + \setstretch {1.667}% default +% DPC 6.7b guard \@ptsize + \ifx\@ptsize\@undefined\else + \ifcase \@ptsize \relax % 10pt + \setstretch {1.667}% + \or % 11pt + \setstretch {1.618}% + \or % 12pt + \setstretch {1.655}% + \fi + \fi + }% + }{% + \renewcommand*{\doublespacing}{% + \@tempdima=\dimexpr (\f@size pt)*2000/ + (\dimexpr \f@baselineskip\relax)*\p@/1000\relax + \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% + }% + }{% + \PackageWarning{scrhack}{unknown \string\doublespacing\space + definition found!\MessageBreak + Maybe you are using a unsupported setpace version}% + }% } %</setspace&body> % \end{macrocode} @@ -1180,6 +1242,8 @@ % \begin{option}{lscape} % \changes{v3.18a}{2015/07/07}{added} % \changes{v3.20}{2016/05/07}{loading \pkg{xpatch} in option part already} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA@key} +% removed} % \begin{macrocode} %<*package&option> \RequirePackage{xpatch}% @@ -1189,7 +1253,7 @@ %<*package&body> \AfterPackage*{lscape}{% \if@scrhack@lscape\scr@hack@load\@pkgextension{lscape}\else - \KOMA@key[.scrhack.sty]{lscape}{% + \KOMA@key[scrhack.sty]{lscape}{% \PackageWarning{scrhack}{option `lscape' ignored}% \FamilyKeyStateProcessed }% @@ -1899,6 +1963,8 @@ % \end{command}^^A \partlineswithprefixformat … % % \begin{option}{headings} +% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage +% commands removed} % The \KOMAScript{} option does not make sense any longer. So it is % deactivated and usage will throw an error. % \begin{macrocode} @@ -1908,7 +1974,7 @@ because of loading standard classes sections hack% }% \RelaxFamilyKey[.\KOMAClassFileName]{KOMA}{headings}% - \KOMA@kav@removekey{.\KOMAClassFileName}{headings}% + \KOMA@kav@removekey{\KOMAClassFileName}{headings}% } % \end{macrocode} % \end{option}^^A headings |