diff options
author | Karl Berry <karl@freefriends.org> | 2009-04-09 16:06:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-04-09 16:06:01 +0000 |
commit | 92643cc428982f5e94dfc5bfe030669dfcfa41ad (patch) | |
tree | 48ad8074b71b01cd64542a4bdb33d18aa4aeb052 /Master/texmf-dist/source/latex/koma-script | |
parent | dee9130d58e3e04c8f38a96834fc8a9000f60c4e (diff) |
koma-script update (8apr09)
git-svn-id: svn://tug.org/texlive/trunk@12679 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script')
7 files changed, 129 insertions, 90 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/ChangeLog b/Master/texmf-dist/source/latex/koma-script/ChangeLog index d2d614c7e13..3157e024db6 100644 --- a/Master/texmf-dist/source/latex/koma-script/ChangeLog +++ b/Master/texmf-dist/source/latex/koma-script/ChangeLog @@ -1,3 +1,31 @@ +r855 2009-04-06 09:07:57 +0200 mjk: + + * Makefile: missing *.hak files added + +r854 2009-04-03 16:48:18 +0200 mjk: + + * releaselist.txt: release 2009/04/03 v3.03a + +r853 2009-04-03 16:17:23 +0200 mjk: + + * scrpage.dtx: no real changes + +r852 2009-04-03 09:40:47 +0200 mjk: + + * scrkvers.dtx: prepared for 3.03a + +r851 2009-04-02 11:31:08 +0200 mjk: + + * scrklist.dtx: Bug at calculation of width of labeling label fixed + +r850 2009-04-02 11:30:28 +0200 mjk: + + * scrkvers.dtx, scrkcomp.dtx: prepared for 3.03a BETA + +r849 2009-03-30 10:29:16 +0200 mjk: + + * releaselist.txt: release 2009/04/01 v3.03 + r848 2009-03-30 09:49:35 +0200 mjk: * scrkvers.dtx, scrkcomp.dtx: prepared for 3.03 diff --git a/Master/texmf-dist/source/latex/koma-script/Makefile b/Master/texmf-dist/source/latex/koma-script/Makefile index 90e83589fd1..020b1ef03a7 100644 --- a/Master/texmf-dist/source/latex/koma-script/Makefile +++ b/Master/texmf-dist/source/latex/koma-script/Makefile @@ -107,6 +107,9 @@ CLS_MAIN = scrbook.cls \ tocstyle.sty \ scrextend.sty \ scrhack.sty \ + float.hak \ + hyperref.hak \ + listings.hak \ DIN.lco \ DINmtext.lco \ SN.lco \ diff --git a/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx b/Master/texmf-dist/source/latex/koma-script/scrkcomp.dtx index 042655ed7f2..3c61b74d38f 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{87} +% \CheckSum{88} % \iffalse meta-comment % ====================================================================== % scrkcomp.dtx @@ -228,6 +228,8 @@ % \changes{v3.02c}{2009/01/28}{Neues Macro} % \begin{macro}{\scr@v@3.03} % \changes{v3.03}{2009/04/01}{Neues Macro} +% \begin{macro}{\scr@v@3.03a} +% \changes{v3.03a}{2009/04/02}{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 @@ -261,6 +263,7 @@ \@namedef{scr@v@3.02b}{9} \@namedef{scr@v@3.02c}{10} \@namedef{scr@v@3.03}{0} +\@namedef{scr@v@3.03a}{0} \@namedef{scr@v@last}{10} % \end{macrocode} % \end{macro} @@ -279,6 +282,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/scrklist.dtx b/Master/texmf-dist/source/latex/koma-script/scrklist.dtx index ca4cb24b130..2d31a24ff23 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrklist.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrklist.dtx @@ -58,7 +58,7 @@ %%% From File: scrklist.dtx %<*driver> % \fi -\ProvidesFile{scrklist.dtx}[2009/01/28 v3.02c KOMA-Script (lists and tabulars)] +\ProvidesFile{scrklist.dtx}[2009/04/02 v3.03a KOMA-Script (lists and tabulars)] % \iffalse \documentclass[halfparskip-]{scrdoc} \usepackage[english,ngerman]{babel} @@ -283,6 +283,8 @@ % \changes{v3.02c}{2009/01/28}{\texttt{labelinglabel} und % \texttt{labelingseparator} werden nun auch zur Berechnung der Breite % verwendet} +% \changes{v3.03a}{2009/04/02}{Argumente in der Berechnung der Label-Breite +% korrigiert} % Die \cs{labeling}-Umgebung ist eine Erweiterung des \textsf{Script} % Pakets. Sie erwartet ein optionales und ein normales Argument. Das % optionale Argument beschreibt einen speziellen Trenntext zwischen @@ -294,7 +296,7 @@ \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% \list{}{\settowidth{\labelwidth}{{% - \usekomafont{labelinglabel}{#1% + \usekomafont{labelinglabel}{#2% \usekomafont{labelingseparator}{\sc@septext}}% }}% \leftmargin\labelwidth \advance\leftmargin by \labelsep diff --git a/Master/texmf-dist/source/latex/koma-script/scrksect.dtx b/Master/texmf-dist/source/latex/koma-script/scrksect.dtx index b3c2dd879e5..12530f887be 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrksect.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrksect.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1770} +% \CheckSum{1771} % \iffalse meta-comment % ====================================================================== % scrksect.dtx @@ -58,7 +58,7 @@ %%% From File: scrksect.dtx %<*driver> % \fi -\ProvidesFile{scrksect.dtx}[2009/01/01 v3.02 KOMA-Script (disposition)] +\ProvidesFile{scrksect.dtx}[2009/04/03 v3.03a KOMA-Script (disposition)] % \iffalse \documentclass[halfparskip-]{scrdoc} \usepackage[english,ngerman]{babel} @@ -838,60 +838,62 @@ % % \subsection{Zähler für die Gliederungsebenen} % -% \begin{Counter}{secnumdepth} +% \begin{Counter}{secnumdepth} % Dieser Zähler gibt an, bis zu welcher Ebene die % Gliederungsüberschriften nummeriert werden. % \begin{macrocode} %<book|report>\setcounter{secnumdepth}{2} %<article>\setcounter{secnumdepth}{3} % \end{macrocode} -% \end{Counter} -% -% \begin{Counter}{part} -% \begin{macro}{\thepart} -% \begin{macro}{\partformat} -% \changes{v2.3c}{1995/08/06}{Duden Regel 6} -% \changes{v2.5f}{1999/02/14}{überflüssiges Leerzeichen am Ende -% entfernt} -% \changes{v2.7h}{2001/04/22}{verlorenen Backslash in \cs{autodot} -% wieder eingefügt} -% \begin{Counter}{chapter} -% \begin{macro}{\thechapter} -% \begin{macro}{\chapterformat} -% \changes{v2.3c}{1995/08/06}{Duden Regel 6} -% \changes{v2.7}{2000/01/03}{einfaches Leerzeichen durch -% \cs{enskip} ersetzt} -% \changes{v2.8}{2001/06/15}{\cs{chapappifprefix} eingefügt} -% \changes{v2.8o}{2001/09/19}{\cs{chapappifchapterprefix} statt -% \cs{chapappifprefix}} -% \changes{v2.96a}{2006/12/02}{\cs{mbox} eingefügt, um \cs{caps} zu -% ermöglichen} -% \begin{macro}{\chaptermarkformat} -% \changes{v2.3a}{1995/07/08}{Leerraum nach der Kapitelnummer -% erhöht} -% \changes{v2.3c}{1995/08/06}{Duden Regel 6} -% \changes{v2.8}{2001/06/15}{\cs{chapappifprefix} eingefügt} -% \changes{v2.8o}{2001/09/19}{\cs{chapappifchapterprefix} statt -% \cs{chapappifprefix}} -% \begin{Counter}{section} -% \begin{macro}{\thesection} +% \end{Counter} +% +% \begin{Counter}{part} +% \begin{macro}{\thepart} +% \begin{macro}{\partformat} +% \changes{v2.3c}{1995/08/06}{Duden Regel 6} +% \changes{v2.5f}{1999/02/14}{überflüssiges Leerzeichen am Ende +% entfernt} +% \changes{v2.7h}{2001/04/22}{verlorenen Backslash in \cs{autodot} +% wieder eingefügt} +% \begin{Counter}{chapter} +% \begin{macro}{\thechapter} +% \begin{macro}{\chapterformat} +% \changes{v2.3c}{1995/08/06}{Duden Regel 6} +% \changes{v2.7}{2000/01/03}{einfaches Leerzeichen durch +% \cs{enskip} ersetzt} +% \changes{v2.8}{2001/06/15}{\cs{chapappifprefix} eingefügt} +% \changes{v2.8o}{2001/09/19}{\cs{chapappifchapterprefix} statt +% \cs{chapappifprefix}} +% \changes{v2.96a}{2006/12/02}{\cs{mbox} eingefügt, um \cs{caps} zu +% ermöglichen} +% \begin{macro}{\chaptermarkformat} +% \changes{v2.3a}{1995/07/08}{Leerraum nach der Kapitelnummer +% erhöht} +% \changes{v2.3c}{1995/08/06}{Duden Regel 6} +% \changes{v2.8}{2001/06/15}{\cs{chapappifprefix} eingefügt} +% \changes{v2.8o}{2001/09/19}{\cs{chapappifchapterprefix} statt +% \cs{chapappifprefix}} +% \changes{v3.03a}{2009/04/03}{Tilde durch \cs{nobreakspace} ersetzt, um die +% Kompatibilität mit Spanish zu verbessern} +% \begin{Counter}{section} +% \begin{macro}{\thesection} % \changes{v2.97e}{2007/11/23}{Kapitelnummer nur im Hauptteil} -% \begin{macro}{\sectionmarkformat} -% \changes{v2.3a}{1995/07/08}{Leerraum nach der Kapitelnummer -% erhöht} -% \changes{v2.3c}{1995/08/06}{Duden Regel 6} -% \begin{Counter}{subsection} -% \begin{macro}{\thesubsection} -% \begin{macro}{\subsectionmarkformat} -% \changes{v2.3a}{1995/07/08}{Leerraum nach der Kapitelnummer -% erhöht} -% \changes{v2.3c}{1995/08/06}{Duden Regel 6} -% \begin{Counter}{subsubsection} -% \begin{macro}{\thesubsubsection} -% \begin{Counter}{paragraph} -% \begin{macro}{\theparagraph} -% \begin{Counter}{subparagraph} -% \begin{macro}{\thesubparagraph} +% \begin{macro}{\sectionmarkformat} +% \changes{v2.3a}{1995/07/08}{Leerraum nach der Kapitelnummer +% erhöht} +% \changes{v2.3c}{1995/08/06}{Duden Regel 6} +% \begin{Counter}{subsection} +% \begin{macro}{\thesubsection} +% \begin{macro}{\subsectionmarkformat} +% \changes{v2.3a}{1995/07/08}{Leerraum nach der Kapitelnummer +% erhöht} +% \changes{v2.3c}{1995/08/06}{Duden Regel 6} +% \begin{Counter}{subsubsection} +% \begin{macro}{\thesubsubsection} +% \begin{Counter}{paragraph} +% \begin{macro}{\theparagraph} +% \begin{Counter}{subparagraph} +% \begin{macro}{\thesubparagraph} % Jede Gliederungsebene benötigt einen Zähler für die % Gliederungsnummer und eine Darstellung des Zählers % (\cs{the\dots}). Desweiteren wird eine Formatierung des Zählers in @@ -906,7 +908,7 @@ \newcounter{chapter} \renewcommand*{\thechapter}{\@arabic\c@chapter} \newcommand*{\chapterformat}{% - \mbox{\chapappifchapterprefix{~}\thechapter\autodot\enskip}% + \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot\enskip}% } \newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }% \thechapter\autodot\enskip} @@ -944,15 +946,15 @@ \theparagraph.\@arabic\c@subparagraph } % \end{macrocode} -% \begin{macro}{\@seccntformat} -% \changes{v2.3c}{1995/08/06}{CJK erweitert} -% \changes{v2.9p}{2004/01/07}{\cs{protect} eingefügt} -% \changes{v2.97}{2007/01/24}{Workaround für das blöde \cs{protect}} -% \begin{macro}{\othersectionlevelsformat} -% \changes{v2.7}{2000/01/03}{neu} -% \changes{v2.7}{2000/01/03}{\cs{quad} durch \cs{enskip} ersetzt} -% \changes{v2.7i}{2001/05/17}{\cs{let} durch \cs{def} ersetzt} -% \changes{v2.97}{2007/01/24}{statt einem Argument jetzt drei} +% \begin{macro}{\@seccntformat} +% \changes{v2.3c}{1995/08/06}{CJK erweitert} +% \changes{v2.9p}{2004/01/07}{\cs{protect} eingefügt} +% \changes{v2.97}{2007/01/24}{Workaround für das blöde \cs{protect}} +% \begin{macro}{\othersectionlevelsformat} +% \changes{v2.7}{2000/01/03}{neu} +% \changes{v2.7}{2000/01/03}{\cs{quad} durch \cs{enskip} ersetzt} +% \changes{v2.7i}{2001/05/17}{\cs{let} durch \cs{def} ersetzt} +% \changes{v2.97}{2007/01/24}{statt einem Argument jetzt drei} % Bei den Ebenen ab \cs{section} erfolgt die Formatierung der % Gliederungnummer in der Überschrift mit einer gemeinsamen % Anweisung. Die interne Anweisung \cs{@seccntformat} wird dabei von @@ -978,27 +980,27 @@ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}% } % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{Counter} -% \end{macro} -% \end{Counter} -% \end{macro} -% \end{Counter} -% \end{macro} -% \end{macro} -% \end{Counter} -% \end{macro} -% \end{macro} -% \end{Counter} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{Counter} -% \end{macro} -% \end{macro} -% \end{Counter} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{Counter} +% \end{macro} +% \end{Counter} +% \end{macro} +% \end{Counter} +% \end{macro} +% \end{macro} +% \end{Counter} +% \end{macro} +% \end{macro} +% \end{Counter} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{Counter} +% \end{macro} +% \end{macro} +% \end{Counter} % % % \changes{v2.8e}{2001/07/10}{\cs{@thepart} entfernt} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx b/Master/texmf-dist/source/latex/koma-script/scrkvers.dtx index 2dfc917b954..f664b5fae13 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{2009/04/01 v3.03 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/04/03 v3.03a KOMA-Script}% \endgroup % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx index 0c8cab72870..7ad856b258a 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx @@ -163,7 +163,7 @@ % |\pagestyle| or |\thispagestyle|. Without optional argument this defines a % page like this: % \begin{center}\unitlength1mm\begin{picture}(120,82) -% \put(0,0){\dashbox{2}(58,82){~}} +% \put(0,0){\dashbox{2}(58,82){\nobreakspace}} % \put(1,78){\makebox(0,0)[l]{\emph{headright}}} % \put(29,78){\makebox(0,0){\emph{headmiddle}}} % \put(57,78){\makebox(0,0)[r]{\emph{headleft}}} @@ -171,7 +171,7 @@ % \put(1,3){\makebox(0,0)[l]{\emph{footright}}} % \put(29,3){\makebox(0,0){\emph{footmiddle}}} % \put(57,3){\makebox(0,0)[r]{\emph{footleft}}} -% \put(60,0){\dashbox{2}(58,82){~}} +% \put(60,0){\dashbox{2}(58,82){\nobreakspace}} % \put(61,78){\makebox(0,0)[l]{\emph{headleft}}} % \put(89,78){\makebox(0,0){\emph{headmiddle}}} % \put(117,78){\makebox(0,0)[r]{\emph{headright}}} @@ -184,7 +184,7 @@ % \emph{w}idth) you get a separationline between head and text and between % text and foot like this (\emph{ilw}=0.5pt): % \begin{center}\unitlength1mm\begin{picture}(120,82) -% \put(0,0){\dashbox{2}(58,82){~}} +% \put(0,0){\dashbox{2}(58,82){\nobreakspace}} % \put(1,78){\makebox(0,0)[l]{\emph{headright}}} % \put(29,78){\makebox(0,0){\emph{headmiddle}}} % \put(57,78){\makebox(0,0)[r]{\emph{headleft}}} @@ -194,7 +194,7 @@ % \put(1,3){\makebox(0,0)[l]{\emph{footright}}} % \put(29,3){\makebox(0,0){\emph{footmiddle}}} % \put(57,3){\makebox(0,0)[r]{\emph{footleft}}} -% \put(60,0){\dashbox{2}(58,82){~}} +% \put(60,0){\dashbox{2}(58,82){\nobreakspace}} % \put(61,78){\makebox(0,0)[l]{\emph{headleft}}} % \put(89,78){\makebox(0,0){\emph{headmiddle}}} % \put(117,78){\makebox(0,0)[r]{\emph{headright}}} @@ -210,7 +210,7 @@ % text and between text and foot and a line above head and below foot like % this (\emph{olw}=2pt, \emph{ilw}=0.5pt): % \begin{center}\unitlength1mm\begin{picture}(120,82) -% \put(0,0){\dashbox{2}(58,82){~}} +% \put(0,0){\dashbox{2}(58,82){\nobreakspace}} % \put(1,80){\rule{56\unitlength}{2pt}} % \put(1,78){\makebox(0,0)[l]{\emph{headright}}} % \put(29,78){\makebox(0,0){\emph{headmiddle}}} @@ -222,7 +222,7 @@ % \put(29,3){\makebox(0,0){\emph{footmiddle}}} % \put(57,3){\makebox(0,0)[r]{\emph{footleft}}} % \put(1,1){\rule{56\unitlength}{2pt}} -% \put(60,0){\dashbox{2}(58,82){~}} +% \put(60,0){\dashbox{2}(58,82){\nobreakspace}} % \put(61,80){\rule{56\unitlength}{2pt}} % \put(61,78){\makebox(0,0)[l]{\emph{headleft}}} % \put(89,78){\makebox(0,0){\emph{headmiddle}}} |