diff options
Diffstat (limited to 'Master')
48 files changed, 186 insertions, 76 deletions
diff --git a/Master/texmf-dist/doc/latex/koma-script/README b/Master/texmf-dist/doc/latex/koma-script/README index fe87975ad0f..32f1bb64f06 100644 --- a/Master/texmf-dist/doc/latex/koma-script/README +++ b/Master/texmf-dist/doc/latex/koma-script/README @@ -1,5 +1,5 @@ -KOMA-Script 2012/05/15 v3.11 +KOMA-Script 2012/07/05 v3.11a Copyright (c) Markus Kohm <komascript(at)gmx.info>, 1994-2012 This material is subject to the LaTeX Project Public License. See diff --git a/Master/texmf-dist/doc/latex/koma-script/manifest.txt b/Master/texmf-dist/doc/latex/koma-script/manifest.txt index 33ae123bd9f..dff67f41e8c 100644 --- a/Master/texmf-dist/doc/latex/koma-script/manifest.txt +++ b/Master/texmf-dist/doc/latex/koma-script/manifest.txt @@ -35,7 +35,7 @@ % Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. % ====================================================================== % -% CONTENTS OF THE KOMA-SCRIPT RELEASE 2012/05/15 v3.11 +% CONTENTS OF THE KOMA-SCRIPT RELEASE 2012/07/05 v3.11a % ------------------------------------------------------ % % diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf b/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf Binary files differindex d5eac19da82..5ef55d3c4d3 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf +++ b/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf b/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf Binary files differindex d50ca219956..f7d8874c98f 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf +++ b/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf diff --git a/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf b/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf Binary files differindex c251f1c590c..118d9132fde 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf +++ b/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf diff --git a/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf b/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf Binary files differindex 02e22ea2fe0..847bc1aca13 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf +++ b/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf diff --git a/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf b/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf Binary files differindex 6add07333b8..9a4e0e2a1c5 100644 --- a/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf +++ b/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf 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)} diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index d278b305c82..85b12978e5a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 57826e4a000..120ba224ce2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 3b805c60958..1aca32a645c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index cf4be08dfbc..a3d39f93080 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index 2467a41874a..1952a12bacd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 69daecae666..741f258bbc6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index 3170a9e86f7..b6618d298e2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index 341b860e3f5..50523968162 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index 98fbaac3323..d47d7183b8d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index dd8aef8d769..7161a95663a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index d6d7767a211..576d9661d3d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 711fd2e817b..5e2384fc8cb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 6f50762ee53..fbfd08d56a9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index d1dcc7a3823..91ec57a6c5c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index 7aad971320e..5c0fa97006f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{float.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index 3f9ec6f8043..e31c7009511 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{floatrow.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 1c0c50cba33..7069132897e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{hyperref.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 5b498c18d81..25b4af412d4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{listings.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index f7ba793a4c6..8041b5d03d1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -189,6 +189,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} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 0c97aa6d666..4aa04ac1b6a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -206,17 +206,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 }% }% }{% @@ -253,7 +261,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: scrklang.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2011/03/09 v3.09} +\def\scrlfileversion{2012/06/15 v3.12} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -661,7 +669,7 @@ for more information about options and their values.% }% \else - \let\scr@removeunused\@empty + \global\let\scr@removeunused\@empty \PackageInfo{% scrbase% }{% @@ -688,7 +696,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'% }% }% @@ -735,8 +743,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/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 3aa0b172fdc..a3f01cb91d2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -191,6 +191,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} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index c3d48aa1162..5530b996b84 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index f5880c0b08d..2e1b4b377d0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -97,7 +97,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrextend.dtx \ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package @@ -230,6 +230,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} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index 794bc4168b0..4911e92f329 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesPackage{scrfontsizes}[% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index a7404a63447..26cdcda7b38 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrhack.dtx %%% using: package,identify diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 468ed54a0a4..54c63ddc138 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -85,7 +85,7 @@ \KOMAProcessOptions\relax %%% From File: scrkfont.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2011/03/09 v3.09} +\def\scrlfileversion{2012/06/15 v3.12} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 7ce524a34c4..98982fb25e2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -41,7 +41,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: scrlfile.dtx -\def\scrlfileversion{2011/03/09 v3.09} +\def\scrlfileversion{2012/06/15 v3.12} \ProvidesPackage{scrlfile}[% \scrlfileversion\space KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% @@ -207,18 +207,22 @@ \newcommand*{\scrlfile@excludedpackages}{} \let\scrlfile@excludedpackages\@empty \newcommand*{\scrlfile@saved@RequirePackage}{} -\newcommand*{\PreventPackageFromLoading}[1]{% - \edef\reserved@b{#1}% +\newcommand*{\PreventPackageFromLoading}{% + \@ifstar{\@PreventPackageFromLoading\PackageInfo}% + {\@PreventPackageFromLoading\PackageWarning}% +} +\newcommand*{\@PreventPackageFromLoading}[2]{% + \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 \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 @@ -240,12 +244,13 @@ \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 }% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index d7f9e2a372a..961d3d1aeb1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -94,7 +94,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -181,6 +181,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} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 306ce0b4327..b5525b76094 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -191,6 +191,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} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index b2d051dbf0f..d47d706fa22 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 93b80934453..6e9a1fa92a6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 7d060da0834..163acd69860 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index 77ab22ea69c..9575795d092 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 4b7c03c7aca..c343c690284 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -68,7 +68,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -633,6 +633,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} %%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 09dedcd6ccf..3b7fc36d21a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 37e53c0d78f..332d545c0fe 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -520,6 +520,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'levy-latex', "die 'skipping, nosell per old latex'", 'lexitex', "die 'skipping, use camel'", 'lfb', "&MAKElfb", + 'lgraph', "die 'skipping, obsolete'", 'lh', "&MAKElh", 'lhfonts', "die 'skipping, use lh'", 'libertine', "die 'skipping, use libertineotf'", |