diff options
author | Karl Berry <karl@freefriends.org> | 2011-01-27 19:01:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-01-27 19:01:38 +0000 |
commit | 2b311b90f06b68e1cb123c58c3b380ea6533eea0 (patch) | |
tree | 06df1db9ecc0e0557987e581462d056ef498e1ef /Master/texmf-dist/source/latex/koma-script/scrkpar.dtx | |
parent | 7d072ac46075608b02b7af6ac92a174183cbcb32 (diff) |
koma-script (26jan11)
git-svn-id: svn://tug.org/texlive/trunk@21195 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 | 66 |
1 files changed, 40 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx b/Master/texmf-dist/source/latex/koma-script/scrkpar.dtx index 3765045b4b0..899b158dfd7 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{524} +% \CheckSum{570} % \iffalse meta-comment % ====================================================================== % scrkpar.dtx -% Copyright (c) Markus Kohm, 2002-2010 +% Copyright (c) Markus Kohm, 2002-2011 % % 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-2010 +% Copyright (c) Markus Kohm, 2002-2011 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -58,7 +58,7 @@ %%% From File: scrkpar.dtx %<*driver> % \fi -\ProvidesFile{scrkpar.dtx}[2008/11/20 v3.01a KOMA-Script (paragraphs)] +\ProvidesFile{scrkpar.dtx}[2010/12/14 v3.08 KOMA-Script (paragraphs)] % \iffalse \documentclass[halfparskip-]{scrdoc} \usepackage[english,ngerman]{babel} @@ -170,7 +170,7 @@ % \begin{option}{parskip} % \changes{v2.8i}{2001/07/22}{neue Option} % \changes{v2.95}{2006/03/11}{primäre \textsf{keyval}-Option} -% \changes{v3.01a}{2008/11/20}{deprecated} +% \changes{v3.08}{2010/12/14}{neuer Wert \texttt{never}} % \begin{option}{parskip-} % \changes{v2.8l}{2001/08/16}{neue Option} % \changes{v2.95}{2006/03/11}{obsolet} @@ -254,54 +254,68 @@ \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% - {false}{0},{off}{0},{no}{0},% - {full-}{1},% - {half-}{2},% - {full}{3},{true}{3},{on}{3},{yes}{3},% - {half}{4},% - {full+}{5},% - {half+}{6},% - {full*}{7},% - {half*}{8},% - {relative}{9},% - {absolute}{10},% + {never}{0},% + {false}{1},{off}{1},{no}{1},% + {full-}{2},% + {half-}{3},% + {full}{4},{true}{4},{on}{4},{yes}{4},% + {half}{5},% + {full+}{6},% + {half+}{7},% + {full*}{8},% + {half*}{9},% + {relative}{10},% + {absolute}{11}% }{#1}% \ifcase\number\@tempa% 0 \endgroup - \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup + \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 2 + \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \or% 2 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \or%3 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 4 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \or%4 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \or%5 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 6 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \or%6 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \or%7 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 8 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%8 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%9 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 10 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -314,7 +328,7 @@ \fi \let\default@par@update=\par@updaterelative }% - \or%10 + \or%11 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass |