summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-04-04 23:13:58 +0000
committerKarl Berry <karl@freefriends.org>2007-04-04 23:13:58 +0000
commit888ae3d22c5cc3e52846f37f393da7fef4933b3a (patch)
treecedfea63f8b31a8ac88cc2f1cedb61b57ada5176 /Master/texmf-dist/source/latex
parent4685491332938d1963868c9e1c57f293fbada1de (diff)
koma-script update
git-svn-id: svn://tug.org/texlive/trunk@4116 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/ChangeLog12
-rw-r--r--Master/texmf-dist/source/latex/koma-script/Makefile2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx8
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkvers.dtx2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrlfile.dtx17
5 files changed, 32 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/ChangeLog b/Master/texmf-dist/source/latex/koma-script/ChangeLog
index 7d1da46aa22..50b392d663e 100644
--- a/Master/texmf-dist/source/latex/koma-script/ChangeLog
+++ b/Master/texmf-dist/source/latex/koma-script/ChangeLog
@@ -1,3 +1,15 @@
+r357 2007-03-07 10:47:26 +0100 mjk:
+
+ * Makefile: renamed komascript-texmf.zip to komascript.tds.zip
+
+r356 2007-03-07 10:40:27 +0100 mjk:
+
+ * scrkvers.dtx, scrkcomp.dtx: prepared for version 2.97a
+
+r355 2007-03-07 10:39:55 +0100 mjk:
+
+ * scrlfile.dtx: fix: \@loadwithoptions was broken
+
r353 2007-03-02 12:13:00 +0100 mjk:
* releaselist.txt: Revision fixed
diff --git a/Master/texmf-dist/source/latex/koma-script/Makefile b/Master/texmf-dist/source/latex/koma-script/Makefile
index 7cbb00ca68b..8cbfdda3f26 100644
--- a/Master/texmf-dist/source/latex/koma-script/Makefile
+++ b/Master/texmf-dist/source/latex/koma-script/Makefile
@@ -205,7 +205,7 @@ endif
$(INSTALL) $(notdir $(DISTDIR))-bin/komascript-texmf/doc/latex/koma-script/koma*.html $(notdir $(DISTDIR))-bin
$(GREP) 'CheckKOMAScriptVersion{' $(notdir $(DISTDIR))-bin/komascript-texmf/source/latex/koma-script/scrkvers.dtx | grep -o '2.*t' > $(notdir $(DISTDIR))-bin/VERSION
$(CD) $(notdir $(DISTDIR))-bin/komascript-texmf && \
- $(ZIP) ../komascript-texmf.zip source doc tex
+ $(ZIP) ../komascript.tds.zip source doc tex
$(RMDIR) $(notdir $(DISTDIR))-bin/komascript-texmf
$(SRM) $(notdir $(DISTDIR))-bin.zip
$(CD) $(notdir $(DISTDIR))-bin && \
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx b/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx
index a1c765553a6..6c2e75a3000 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{53}
+% \CheckSum{54}
% \iffalse meta-comment
% ======================================================================
% scrkcomp.dtx
@@ -58,7 +58,7 @@
%%% From File: scrkcomp.dtx
%<*driver>
% \fi
-\ProvidesFile{scrkcomp.dtx}[2007/02/03 v2.97 KOMA-Script (compatibility)]
+\ProvidesFile{scrkcomp.dtx}[2007/03/07 v2.97a KOMA-Script (compatibility)]
% \iffalse
\documentclass{scrdoc}
\usepackage[english,ngerman]{babel}
@@ -166,6 +166,8 @@
% \changes{v2.96a}{2006/11/27}{Neues Macro}
% \begin{macro}{\scr@v@2.97}
% \changes{v2.97}{2007/03/02}{Neues Macro}
+% \begin{macro}{\scr@v@2.97a}
+% \changes{v2.97a}{2007/03/07}{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
@@ -181,6 +183,7 @@
\@namedef{scr@v@2.96}{2}
\@namedef{scr@v@2.96a}{3}
\@namedef{scr@v@2.97}{3}
+\@namedef{scr@v@2.97a}{3}
\@namedef{scr@v@last}{3}
% \end{macrocode}
% \end{macro}
@@ -194,6 +197,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \end{option}
%
%
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx b/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx
index 52512f486b6..853d81e84b5 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{2007/03/02 v2.97 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2007/03/07 v2.97a 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 a0b0ee80fdd..b206c4c2727 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{252}
+% \CheckSum{259}
% \iffalse meta-comment
% ======================================================================
% scrlfile.dtx
@@ -58,7 +58,7 @@
%%% From File: scrlfile.dtx
%<*driver|scrlfile|load>
% \fi
-\def\scrlfileversion{2006/07/19 v2.96}
+\def\scrlfileversion{2007/03/07 v2.97a}
% \iffalse
%</driver|scrlfile|load>
%<*driver>
@@ -456,8 +456,10 @@
%
% \begin{macro}{\@loadwithoptions}
% \changes{v2.96}{2006/07/19}{new redefinition}
-% \begin{macro}{\scr@loadwithoption}
+% \begin{macro}{\scr@loadwithoptions}
% \changes{v2.96}{2006/07/19}{new helper macro}
+% \begin{macro}{\scr@@loadwithoptions}
+% \changes{v2.97a}{2007/03/07}{new helper macro}
% \LaTeX{} uses this macro for loading classes and packages using
% \cs{LoadClassWithOptions} or \cs{RequirePackageWithOptions}. We simply say
% now: if the class or package should be replaced by another, try it again
@@ -465,20 +467,25 @@
% error if the replacements are nested too deep. This should be, because it
% will also result in an error using ring replacements.
% \begin{macrocode}
+\newcommand*{\scr@@loadwithoptions}{}
\newcommand*{\scr@loadwithoptions}{}
\let\scr@loadwithoptions\@loadwithoptions
\renewcommand*{\@loadwithoptions}[3]{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname #3.#1-@aliasname\endcsname\relax
- \scr@loadwithoptions{#1}{#2}{#3}%
+ \def\scr@@loadwithoptions{\scr@loadwithoptions{#1}{#2}{#3}}%
\else
\scr@replacefile@msg{\csname #3.#1-@aliasname\endcsname.#1}{#3.#1}%
- \@loadwithoptions{#1}{#2}{\csname #3.#1-@aliasname\endcsname}%
+ \def\scr@@loadwithoptions{%
+ \@loadwithoptions{#1}{#2}{\csname #3.#1-@aliasname\endcsname}%
+ }%
\fi
+ \scr@@loadwithoptions
}
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@onefilewithoption}
% \changes{v2.96}{2006/07/19}{new redefinition}