diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-28 15:17:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-28 15:17:41 +0000 |
commit | 960967cf105bdfe5b6ef819520fa40f481db97bd (patch) | |
tree | 53cf0c33a6594f6ea60d9e0ebc925092dcb692ea /Master/texmf-dist/source | |
parent | 92acb993a39825758c6f99417d1fc4cf00b0ae53 (diff) |
koma-script (5jul12)
git-svn-id: svn://tug.org/texlive/trunk@27218 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
5 files changed, 113 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/ChangeLog b/Master/texmf-dist/source/latex/koma-script/ChangeLog index c68372809b8..d214a6cced7 100644 --- a/Master/texmf-dist/source/latex/koma-script/ChangeLog +++ b/Master/texmf-dist/source/latex/koma-script/ChangeLog @@ -1,3 +1,53 @@ +r1235 2012-07-05 09:32:36 +0200 mjk: + + * scrkvers.dtx: prepared for 3.11a + +r1234 2012-06-29 17:54:11 +0200 mjk: + + * TODO: Don't forget changes + +r1233 2012-06-15 20:59:39 +0200 mjk: + + * scrlfile.dtx: improvement for last extension + +r1232 2012-06-15 20:53:02 +0200 mjk: + + * TODO, scrlfile.dtx: \PreventPackageFromLoading* added (uses info + instead of warning) + +r1231 2012-06-13 16:03:03 +0200 mjk: + + * scrlfile.dtx: one write fault error fixed [MHP] + +r1230 2012-06-12 12:03:42 +0200 mjk: + + * scrlfile.dtx: Fixed: \PreventPackageFromLoading prevents only last + package [reported by MHP] + +r1229 2012-06-11 10:43:49 +0200 mjk: + + * scrkbase.dtx: \FamilyProcessOptions inside of classes do not longer + report unknown values to known keys a error, but as info only and + maybe as unused global option. + +r1228 2012-05-28 14:35:47 +0200 mjk: + + * scrkbase.dtx: make last fix more robust + +r1227 2012-05-28 13:46:29 +0200 mjk: + + * scrkbase.dtx: \FamilySetNumerical does not longer consume known + global options with unknown values + +r1226 2012-05-25 11:34:01 +0200 mjk: + + * scrkvers.dtx, scrkcomp.dtx: prepared for 3.11a BETA + +r1225 2012-05-25 11:31:55 +0200 mjk: + + * scrkbase.dtx: Error/Info Message for unkown bool values at + \FamilySetBool fixed. + r1224 2012-05-15 15:21:01 +0200 mjk: * Makefile.baseinit, doc/, doc/Makefile: fix installation of diff --git a/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx b/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx index 996cf3ad3d3..6717f00fc59 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkbase.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1382} +% \CheckSum{1419} % \iffalse meta-comment % ====================================================================== % scrkbase.dtx @@ -58,7 +58,7 @@ %%% From File: scrkbase.dtx %<*driver> % \fi -\ProvidesFile{scrkbase.dtx}[2011/10/26 v3.10 KOMA-Script (basics)] +\ProvidesFile{scrkbase.dtx}[2012/06/11 v3.11a KOMA-Script (basics)] % \iffalse %</driver> %<package&option>\ProvidesPackage{% @@ -340,6 +340,8 @@ % % \begin{macro}{\FamilyProcessOptions} % \changes{v3.00}{2008/04/30}{Neue Anweisung}% +% \changes{v3.11a}{2012/06/11}{Klassen melden falsche Werte nicht +% selbst als Fehler, sondern informieren nur darüber} % \begin{macro}{\scr@removeunused} % \changes{v3.10}{2011/09/12}{neu (intern)}% % Diese Anweisung führt alle Optionen, sowohl normal deklarierte als auch @@ -390,17 +392,25 @@ \scr@optiontest{#2#1}\CurrentOption{% \default@ds }{% + \let\scr@removeunused\relax \edef\reserved@a{% \noexpand\setkeys{#2#1}{\CurrentOption}% \noexpand\def\noexpand\CurrentOption{\CurrentOption}% }\reserved@a + \ifx\scr@removeunused\relax\else\default@ds\fi }% }{% - \@expandtwoargs\setkeys{#2}% - \CurrentOption + \let\scr@removeunused\relax + \edef\reserved@a{% + \noexpand\setkeys{#2}{\CurrentOption}% + \noexpand\def\noexpand\CurrentOption{\CurrentOption}% + }\reserved@a + \if\scr@removeunused\relax\else\default@ds\fi \scr@optiontest{#2#1}\CurrentOption{}{% + \let\scr@removeunused\relax \@expandtwoargs\setkeys{#2#1}% \CurrentOption + \ifx\scr@removeunused\relax\else\default@ds\fi }% }% }{% @@ -1397,8 +1407,10 @@ % % \begin{macro}{\FamilyUnknownKeyValue} % \changes{v3.10}{2011/09/12}{no error while processing global options}% +% \changes{v3.11a}{2012/05/28}{prevent remove from list of unused global +% options globally}% % Dieses Makro berichtet über Fehler wegen unbekannter Wertübergabe an einen -% Schlüssel. Das erste Argument ist die Familie, das zweit der Schlüssel, +% Schlüssel. Das erste Argument ist die Familie, das zweite der Schlüssel, % das dritte der Wert und das vierte die Liste der möglichen Werte. % \begin{macrocode} %<*base> @@ -1417,7 +1429,7 @@ for more information about options and their values.% }% \else - \let\scr@removeunused\@empty + \global\let\scr@removeunused\@empty \PackageInfo{% scrbase% }{% @@ -1465,6 +1477,7 @@ % \end{macrocode} % \begin{macro}{\FamilySetBool} % \changes{v3.00}{2008/04/30}{Neue Anweisung} +% \changes{v3.11a}{2012/05/25}{Argument in Fehlermeldung korrigiert} % Über diese Anweisung wird der Wert dann gesetzt. Dabei ist das erste % Argument die Familie, das zweite der Name des Schlüsselt, das dritte der % Schalter und das vierte schließlich der gewünschte Wert. @@ -1476,7 +1489,7 @@ \ifstr{#4}{false}{\@nameuse{#3false}}{% \ifstr{#4}{off}{\@nameuse{#3false}}{% \ifstr{#4}{no}{\@nameuse{#3false}}{% - \FamilyUnknownKeyValue{#1}{#2}{#3}{% + \FamilyUnknownKeyValue{#1}{#2}{#4}{% `true', `on', `yes', `false', `off', `no'% }% }% @@ -1569,7 +1582,9 @@ \fi } % \end{macrocode} -% \begin{macro}{\FamilySetNumerical} +% \begin{macro}{\FamilySetNumerical} +% \changes{v3.11a}{2012/05/28}{call of \cs{FamilyUnknownKeyValue} outside of +% local group} % Die eigentliche Arbeit dabei wird von diesem Makro erledigt. Dabei % wird die Familie zu Argument 1, der Name des Schlüssels zu Argument 2, der % Name des Makros, das definiert werden soll zu Argument 3, die Liste zu @@ -1597,8 +1612,9 @@ \noexpand\@namedef{#3}{\@tempa}% }% \else - \FamilyUnknownKeyValue{#1}{#2}{#5}{\@tempa}% - \let\@tempa=\endgroup + \edef\@tempa{\endgroup + \noexpand\FamilyUnknownKeyValue{#1}{#2}{#5}{\@tempa}% + }% \fi \@tempa \let\FamilyElseValues\@empty diff --git a/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx b/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx index 5c22aee4d93..b6f146630ce 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx @@ -1,4 +1,4 @@ -% \CheckSum{104} +% \CheckSum{105} % \iffalse meta-comment % ====================================================================== % scrkcomp.dtx @@ -262,6 +262,8 @@ % \changes{v3.10b}{2012/03/13}{Neues Macro} % \begin{macro}{\scr@v@3.11} % \changes{v3.11}{2012/05/15}{Neues Macro} +% \begin{macro}{\scr@v@3.11a} +% \changes{v3.11a}{2012/05/25}{Neues Macro} % \begin{macro}{\scr@v@last} % \changes{v2.9u}{2005/03/05}{Neues Macro} % Nun die unterschiedlichen möglichen Werte (|\scr@v@last| ist jeweils die @@ -312,6 +314,7 @@ \@namedef{scr@v@3.10a}{10} \@namedef{scr@v@3.10b}{10} \@namedef{scr@v@3.11}{10} +\@namedef{scr@v@3.11a}{10} \@namedef{scr@v@last}{10} % \end{macrocode} % \end{macro} @@ -347,6 +350,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % \end{macro} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx b/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx index 62e93e3b812..c83a88653bd 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx @@ -112,7 +112,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx index b7c2ba8f256..01f99fd20b0 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx @@ -1,4 +1,4 @@ -% \CheckSum{593} +% \CheckSum{599} % \iffalse meta-comment % ====================================================================== % scrlfile.dtx @@ -64,7 +64,7 @@ %%% From File: scrlfile.dtx %<*driver|scrlfile|load> % \fi -\def\scrlfileversion{2011/03/09 v3.09} +\def\scrlfileversion{2012/06/15 v3.12} % \iffalse %</driver|scrlfile|load> %<*driver> @@ -369,6 +369,7 @@ % \cs{RequirePackage} before loading the class. % % \DescribeMacro{\PreventPackageFromLoading} +% \DescribeMacro{\PreventPackageFromLoading*} % \DescribeMacro{\ResetPreventPackageFromLoading} % \DescribeMacro{\StorePreventPackageFromLoading} % The command \cs{PreventPackageFromLoading}\marg{package list} @@ -382,6 +383,11 @@ % use \cs{StorePackageFromLoading}\marg{command} to store the current list at % macro \meta{command}. % +% The normal version of \cs{PreventPackageFromLoading} with empty argument +% results in a warning message. The star version +% \cs{PreventPackageFromLoading*} writes only an info into the log-file, if +% the argument is empty. Both commands are not robust! +% % \DescribeMacro{\BeforeClosingMainAux} % The command \cs{BeforeClosingMainAux}\marg{instructions} % works different from all the commands above. Is isn't a @@ -780,23 +786,32 @@ % \end{macro} % % \begin{macro}{\PreventPackageFromLoading} -% \changes{v3.08}{2010/11/04}{New} +% \changes{v3.08}{2010/11/04}{New} +% \changes{v3.11a}{2012/06/13}{write fault error in \cs{MessageBreak} fixed} +% \changes{v3.12}{2012/06/15}{new star version allowes empty argument with +% info instead of warning} +% \begin{macro}{\@PreventPackageFromLoading} +% \changes{v3.12}{2012/06/15}{New (internal)} % \begin{macro}{\scrlfile@excludedpackages} -% \changes{v3.08}{2010/11/04}{New (internal)} +% \changes{v3.08}{2010/11/04}{New (internal)} % \begin{macro}{\scrlfile@saved@RequirePackage} -% \changes{v3.08}{2010/11/04}{New (internal)} +% \changes{v3.08}{2010/11/04}{New (internal)} % \begin{macrocode} \newcommand*{\scrlfile@excludedpackages}{} \let\scrlfile@excludedpackages\@empty \newcommand*{\scrlfile@saved@RequirePackage}{} -\newcommand*{\PreventPackageFromLoading}[1]{% +\newcommand*{\PreventPackageFromLoading}{% + \@ifstar{\@PreventPackageFromLoading\PackageInfo}% + {\@PreventPackageFromLoading\PackageWarning}% +} +\newcommand*{\@PreventPackageFromLoading}[2]{% % \end{macrocode} % We do nothing, if the argument was empty: % \begin{macrocode} - \edef\reserved@b{#1}% + \edef\reserved@b{#2}% \ifx \reserved@b\@empty - \PackageWarning{scrlfile}{% - \string\PreventPackageFromLoading\space with empty argument\MesageBreak + #1{scrlfile}{% + \string\PreventPackageFromLoading\space with empty argument\MessageBreak ignored% }% \else @@ -807,7 +822,7 @@ \ifx\scrlfile@excludedpackages\@empty \let\scrlfile@saved@RequirePackage\RequirePackage \let\RequirePackage\scrlfile@RequirePackage - \def\reserved@a#1{% + \def\reserved@a#2{% \@latex@error {\noexpand \usepackage before \string\documentclass}% {\noexpand \usepackage may only appear in the document @@ -829,17 +844,20 @@ % We have to test, if a package was already loaded. Only not yet loaded % packages will be added to the exclusion list. Empty arguments will be % ignored. +% \changes{v3.11a}{2012/06/11}{missing \cs{scrlfile@excludepackages} at +% redefinition of \cs{scrlfile@excludepackages} added} % \begin{macrocode} \expandafter\@for \expandafter\reserved@a\expandafter:\expandafter=% \reserved@b\do {% \ifx\reserved@a\@empty\else \expandafter\@ifpackageloaded\expandafter{\reserved@a}{% - \PackageWarning{scrlfile}{% + #1{scrlfile}{% package `\reserved@a' already loaded.\MessageBreak Cannot prevent it from beeing loaded% }% }{% - \edef\scrlfile@excludedpackages{,\reserved@a}% + \edef\scrlfile@excludedpackages{\scrlfile@excludedpackages,% + \reserved@a}% }% \fi }% @@ -912,6 +930,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\scr@gobbleopt} % \changes{v3.08}{2010/11/04}{New (internal)} |