diff options
author | Karl Berry <karl@freefriends.org> | 2008-11-12 00:44:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-11-12 00:44:32 +0000 |
commit | e0fa36719ae8b943d0c515ccc2a4f1e2670cc614 (patch) | |
tree | cfd7d451101897cf222cd885a36573ccacd922c4 /Master/texmf-dist/source/latex/koma-script/scrkpar.dtx | |
parent | 6d06dddb5a2041f7c07b6502a3bfa973f0d86635 (diff) |
koma-script update (11nov08)
git-svn-id: svn://tug.org/texlive/trunk@11262 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkpar.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrkpar.dtx | 108 |
1 files changed, 66 insertions, 42 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx b/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx index 96d2244275e..a8a64dd2b32 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx @@ -1,8 +1,8 @@ -% \CheckSum{530} +% \CheckSum{532} % \iffalse meta-comment % ====================================================================== % scrkpar.dtx -% Copyright (c) Markus Kohm, 2002-2007 +% Copyright (c) Markus Kohm, 2002-2008 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkpar.dtx -% 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. @@ -58,7 +58,7 @@ %%% From File: scrkpar.dtx %<*driver> % \fi -\ProvidesFile{scrkpar.dtx}[2007/10/03 v2.97d KOMA-Script (paragraphs)] +\ProvidesFile{scrkpar.dtx}[2008/05/02 v3.00 KOMA-Script (paragraphs)] % \iffalse \documentclass[halfparskip-]{scrdoc} \usepackage[english,ngerman]{babel} @@ -322,14 +322,14 @@ \endgroup \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parskip-}{parskip=full-} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parskip+}{parskip=full+} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parskip*}{parskip=full*} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip}{parskip=half} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip-}{parskip=half-} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip+}{parskip=half+} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip*}{parskip=half*} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parindent}{parskip=false} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip-}{parskip=full-} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip+}{parskip=full+} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip*}{parskip=full*} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip}{parskip=half} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip-}{parskip=half-} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip+}{parskip=half+} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip*}{parskip=half*} +\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parindent}{parskip=false} % \end{macrocode} % \end{option} % \end{option} @@ -538,45 +538,69 @@ % \end{macro} % % Absatzabstand und Absatzeinzug: -% \begin{macro}{\@listi} -% \begin{macro}{\@listI} -% \begin{macro}{\@listii} -% \begin{macro}{\@listiii} -% \begin{macro}{\@list@extra} -% \changes{v2.8q}{2001/11/06}{neu (intern)} -% \changes{v2.95c}{2006/08/03}{\cs{parsep} fixed} -% \begin{macro}{\add@extra@listi} -% \changes{v2.9h}{2002/09/03}{neu (intern)} -% \begin{macro}{\footnotesize} -% \changes{v2.9h}{2002/09/03}{etwas robuster} -% \begin{macro}{\small} -% \changes{v2.9h}{2002/09/03}{etwas robuster} +% \begin{macro}{\@list@extra} +% \changes{v2.8q}{2001/11/06}{neu (intern)} +% \changes{v2.95c}{2006/08/03}{\cs{parsep} fixed} +% \begin{macro}{\add@extra@listi} +% \changes{v2.9h}{2002/09/03}{neu (intern)} % Ab Version 2.8i wird hier optionsabhängig gearbeitet. Dabei müssen % auch die Befehle bei der Umschaltung der Schriftgröße für \cs{small} % und \cs{footnotesize} geändert werden. % \begin{macrocode} -\g@addto@macro{\@listi}{\@list@extra} -\let\@listI=\@listi -\g@addto@macro{\@listii}{\@list@extra} -\g@addto@macro{\@listiii}{\@list@extra} +\newcommand*{\@list@extra}{% + \ifdim\parskip>\z@\topsep\z@\parsep\parskip\itemsep\z@\fi +} \newcommand*{\add@extra@listi}[1]{% \expandafter\let\csname #1@listi\endcsname=\@listi \def\@listi{\csname #1@listi\endcsname\@list@extra}% } -\g@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}} -\g@addto@macro{\small}{\protect\add@extra@listi{sml}} -\newcommand*{\@list@extra}{% - \ifdim\parskip>\z@\topsep\z@\parsep\parskip\itemsep\z@\fi -} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} +% \iffalse +%</body> +%<*body|10pt|11pt|12pt> +% \fi +% \changes{v2.98c}{2008/03/26}{Umstellung für die pt-Dateien} +% \begin{macro}{\@listi} +% \changes{v2.98c}{2008/03/27}{\cs{g@addto@macro} durch \cs{l@addto@macro} +% ersetzt} +% \begin{macro}{\@listI} +% \begin{macro}{\@listii} +% \changes{v2.98c}{2008/03/27}{\cs{g@addto@macro} durch \cs{l@addto@macro} +% ersetzt} +% \begin{macro}{\@listiii} +% \changes{v2.98c}{2008/03/27}{\cs{g@addto@macro} durch \cs{l@addto@macro} +% ersetzt} +% \begin{macro}{\footnotesize} +% \changes{v2.9h}{2002/09/03}{etwas robuster} +% \changes{v2.98c}{2008/03/27}{\cs{g@addto@macro} durch \cs{l@addto@macro} +% ersetzt} +% \begin{macro}{\small} +% \changes{v2.9h}{2002/09/03}{etwas robuster} +% \changes{v2.98c}{2008/03/27}{\cs{g@addto@macro} durch \cs{l@addto@macro} +% ersetzt} +% \begin{macrocode} +%<10pt|11pt|12pt>\@ifundefined{@list@extra}{}{% + \l@addto@macro{\@listi}{\@list@extra}% + \let\@listI=\@listi + \l@addto@macro{\@listii}{\@list@extra}% + \l@addto@macro{\@listiii}{\@list@extra}% + \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}% + \l@addto@macro{\small}{\protect\add@extra@listi{sml}}% +%<10pt|11pt|12pt> \@listi +%<10pt|11pt|12pt>} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \iffalse +%</body|10pt|11pt|12pt> +%<*body> +% \fi % % % \subsection{Umbruchsteuerung} |