koma-script update (11nov08)

git-svn-id: svn://tug.org/texlive/trunk@11262 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 41 insertions, 18 deletions

diff --git a/Master/texmf-dist/source/latex/koma-script/Makefile b/Master/texmf-dist/source/latex/koma-script/Makefile
index ff272bf243c..e93d2d1db90 100644
--- a/Master/texmf-dist/source/latex/koma-script/Makefile
+++ b/Master/texmf-dist/source/latex/koma-script/Makefile
@@ -1,6 +1,6 @@
 # ======================================================================
 # Makefile
-# Copyright (c) Markus Kohm, 2002-2007
+# Copyright (c) Markus Kohm, 2002-2008
 #
 # This file is part of the LaTeX2e KOMA-Script bundle.
 #
@@ -18,7 +18,7 @@
 # This work consists of all files listed in manifest.txt.
 # ----------------------------------------------------------------------
 # Makefile
-# Copyright (c) Markus Kohm, 2002-2007
+# Copyright (c) Markus Kohm, 2002-2008
 #
 # Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
 # Version 1.3b, verteilt und/oder veraendert werden.
@@ -91,14 +91,21 @@ CLS_MAIN	= scrbook.cls \
 		  scrlttr2.cls \
 	          scrlettr.cls \
 		  typearea.sty \
+		  scrsize10pt.clo \
+		  scrsize11pt.clo \
+		  scrsize12pt.clo \
 		  scrlfile.sty \
+		  scrbase.sty \
 		  scrkbase.sty \
 		  scraddr.sty \
 		  scrpage.sty \
 		  scrpage2.sty \
 		  scrtime.sty \
 		  scrdate.sty \
+		  scrjura.sty \
+		  tocbasic.sty \
 		  tocstyle.sty \
+		  scrextend.sty \
 	          DIN.lco \
 		  DINmtext.lco \
 		  SN.lco \
@@ -141,6 +148,9 @@ CLS_MAIN_DTX    = scrbeta.dtx \
 		  scrtime.dtx \
 		  scrlettr.dtx \
 		  scrlogo.dtx \
+	          scrextend.dtx \
+		  scrjura.dtx \
+		  tocbasic.dtx \
 		  tocstyle.dtx
 
 STATIC_DOC      = README \
@@ -158,13 +168,24 @@ CLS_MAIN_INS	= scrmain.ins
 CLS_MAIN_SUBINS	= scrlfile.ins scraddr.ins scrlettr.ins scrpage.ins \
 		  scrtime.ins
 
-ALPHA_INS       = tocstyle.dtx
+ALPHA_INS       = tocstyle.dtx tocbasic.dtx scrjura.dtx
 
-DTX_IS_INS      = tocstyle.dtx
+ALPHA_DOC       = tocstyle.pdf scrjura.pdf
+
+ALPHA_DTX       = $(subst .pdf,.dtx,$(ALPHA_DOC))
+
+DTX_IS_INS      = tocstyle.dtx tocbasic.dtx scrjura.dtx
 
 CLS_MAIN_SRC	= $(CLS_MAIN_DTX) $(CLS_MAIN_INS) $(CLS_MAIN_SUBINS) \
 		  scrsource.tex
 
+$(ALPHA_DOC): $(ALPHA_DTX)
+	$(LATEX) $(BATCHMODE) $(PDFOUTPUT) $(subst .pdf,.dtx,$@)
+	$(MKINDEX) $(subst .pdf,,$@)
+	$(LATEX) $(BATCHMODE) $(PDFOUTPUT) $(subst .pdf,.dtx,$@)
+	$(MKINDEX) $(subst .pdf,,$@)
+	$(LATEX) $(BATCHMODE) $(PDFOUTPUT) $(subst .pdf,.dtx,$@)
+
 $(CLS_MAIN): $(CLS_MAIN_DVI) $(CLS_MAIN_INS) $(INS_TEMPLATES) $(MAKE_FILES)
 	$(TEXUNPACK) $(CLS_MAIN_INS)
 	$(foreach alphains,$(ALPHA_INS),$(TEXUNPACK) $(alphains);)
@@ -191,7 +212,7 @@ MISC_SRC	= $(INS_TEMPLATES) $(MAKE_FILES) \
 
 DIST_SRC	= $(MISC_SRC) $(CLS_SRC)
 
-DIST_FILES	= $(DIST_SRC) $(STATIC_DOC)
+DIST_FILES	= $(DIST_SRC) $(STATIC_DOC) $(ALPHA_DOC)
 
 MAINTAIN_SRC    = $(DIST_SRC) missing.dtx .cvsignore
 
@@ -200,12 +221,13 @@ MAINTAIN_FILES  = $(MAINTAIN_SRC)
 
 # ----------------------------------------------------------------------
 # additional ruls
-bindist: dist
+bindist:dist
 	$(UNTARGZ) $(DISTDIR).tar.gz
+	chmod -R a+w $(DISTDIR)
 ifdef PREPARERELEASE
-	$(foreach dtxins,$(DTX_IS_INS),$(SYMLINK) $(dtxins) $(dtxins).ins;)
+	$(foreach dtxins,$(DTX_IS_INS),\
+	          sed -i -e 's/{trace,/{/g;s/\(\\let\\ifbeta=\\if\)true/\1false/' $(DISTDIR)/$(dtxins) && ) :
 	developer/scripts/preparerelease.sh 2 $(notdir $(DISTDIR))
-	$(foreach dtxins,$(DTX_IS_INS),$(RM) $(dtxins).ins;)
 endif
 	$(CD) $(notdir $(DISTDIR)) && \
 	  $(MAKE)
@@ -233,15 +255,16 @@ endif
 # local rules
 
 ChangeLog:
-	$(warning Developers should generate ChangeLog manually using:)
-	$(SECHO) "  developer/scripts/genchangelog.pl ." >&2
-	$(SECHO) "  mv doc/ChangeLog.tmp doc/ChangeLog.svn" >&2
-	$(SECHO) "  cat doc/ChangeLog.svn ChangeLog.cvs > ChangeLog" >&2
+	$(warning Developers should generate ChangeLog manually, see developers/doc/README.)
+	$(warning Distributors should not use a SVN version for their distributions!)
+	$(warning Betatester may continue with an empty ChangeLog after using: touch ChangeLog)
 	@exit 1
 
 default_local: test_baseinit $(CLS_FILES)
 
-install_local: test_baseinit $(DIST_SRC) $(CLS_FILES) $(STATIC_DOC)
+prepare_local: # nothing to do
+
+install_local: test_baseinit $(DIST_SRC) $(CLS_FILES) $(STATIC_DOC) $(ALPHA_DOC)
 	@if ! $(MKDIR) $(INSTALLSRCDIR) \
 	  || ! $(MKDIR) $(INSTALLCLSDIR) \
 	  || ! $(MKDIR) $(INSTALLDOCDIR) ; then \
@@ -254,7 +277,7 @@ install_local: test_baseinit $(DIST_SRC) $(CLS_FILES) $(STATIC_DOC)
 	fi
 	$(INSTALL) $(DIST_SRC) $(INSTALLSRCDIR)
 	$(INSTALL) $(CLS_FILES) $(INSTALLCLSDIR)
-	$(INSTALL) $(STATIC_DOC) $(INSTALLDOCDIR)
+	$(INSTALL) $(STATIC_DOC) $(ALPHA_DOC) $(INSTALLDOCDIR)
 	$(SECHO) ------------------------------------------------------------
 	$(SECHO) Installed files at $(INSTALLSRCDIR):
 	$(SECHO) $(DIST_SRC)
@@ -263,7 +286,7 @@ install_local: test_baseinit $(DIST_SRC) $(CLS_FILES) $(STATIC_DOC)
 	$(SECHO) $(CLS_FILES)
 	$(SECHO) ------------------------------------------------------------
 	$(SECHO) Installed files at $(INSTALLDOCDIR):
-	$(SECHO) $(STATIC_DOC)
+	$(SECHO) $(STATIC_DOC) $(ALPHA_DOC)
 	$(SECHO) ------------------------------------------------------------
 
 uninstall_local:
@@ -308,9 +331,9 @@ maintainclean_local: clean_local
 	$(SRM) $(GENERATED)
 
 dist_prior:
-ifdef PREPARERELEASE
-	developer/scripts/preparerelease.sh 1
-endif
+#ifdef PREPARERELEASE
+#	developer/scripts/preparerelease.sh 1
+#endif
 	-$(RMDIR) $(DISTDIR)
 	$(MKDIR) $(DISTDIR)