From ab72bdd179c9a64d43313beb199d0fdf7fef8c83 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 26 Jul 2020 03:02:17 +0000 Subject: CTAN sync 202007260302 --- .../koma-script/source/scrkernel-typearea.dtx | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'macros/latex/contrib/koma-script/source/scrkernel-typearea.dtx') diff --git a/macros/latex/contrib/koma-script/source/scrkernel-typearea.dtx b/macros/latex/contrib/koma-script/source/scrkernel-typearea.dtx index 3c6f846094..ec6e89babf 100644 --- a/macros/latex/contrib/koma-script/source/scrkernel-typearea.dtx +++ b/macros/latex/contrib/koma-script/source/scrkernel-typearea.dtx @@ -1,4 +1,3 @@ -% \CheckSum{2945} % \iffalse meta-comment % ====================================================================== % scrkernel-typearea.dtx @@ -55,7 +54,7 @@ % Right brace \} Tilde \~} % % \iffalse meta-comment -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%%% (run: identify) %%%% (run: init) %%%% (run: options) @@ -66,9 +65,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2020-03-24 13:12:02 +0100 (Tue, 24 Mar 2020) $ + \filedate$Date: 2020-04-27 15:04:43 +0200 (Mon, 27 Apr 2020) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3470 $ + \filerevision$Revision: 3488 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-typearea.dtx}[% @@ -3127,8 +3126,6 @@ % \changes{v2.5}{1997/06/17}{Einzelzeichenscanner durch % Mustererkennung ersetzt}%^^A % \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A -% \changes{v3.30}{2020/03/24}{avoid error message for unknown \texttt{BCOR} -% value to \cs{documentclass}}%^^A % Das Makro \cs{@BCOR} wird später benötigt, um die Option % \texttt{BCOR\emph{BCOR}} zu erkennen. Die Option wird über ihr % Muster erkannt. @@ -3152,10 +3149,17 @@ % \cs{ProcessOptions}). % \changes{v3.22}{2016/07/29}{missing deprecated option warning added}%^^A % \changes{v3.28}{2019/11/18}{\cs{ifdimen} renamed to \cs{Ifdimen}}%^^A +% \changes{v3.30}{2020/03/24}{avoid error message for unknown \texttt{BCOR} +% value to \cs{documentclass}}%^^A +% \changes{v3.31}{2020/04/27}{improved valid value recognization}%^^A % \begin{macrocode} %<*class> - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{BCOR#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifdimen{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifdimen{#2}{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }% % %<*package> \Ifdimen{#2}{% @@ -3183,6 +3187,7 @@ % \changes{v3.28}{2019/11/18}{\cs{ifnumber} umbenannt in \cs{Ifnumber}}%^^A % \changes{v3.30}{2020/03/24}{avoid error message for unknown \texttt{DIV} % value to \cs{documentclass}}%^^A +% \changes{v3.31}{2020/04/27}{improved valid value recognization}%^^A % Die grundsätzliche Funktion ist die gleiche wie bei \cs{@BCOR}, % \cs{@@BCOR}. % \begin{macrocode} @@ -3192,8 +3197,12 @@ \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb %<*class> - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{DIV#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifnumber{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifnumber{#2}{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }% % %<*package> \Ifnumber{#2}{% -- cgit v1.2.3