From 2b311b90f06b68e1cb123c58c3b380ea6533eea0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 27 Jan 2011 19:01:38 +0000 Subject: koma-script (26jan11) git-svn-id: svn://tug.org/texlive/trunk@21195 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 56 ++++++++++++++-------- 1 file changed, 37 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty') diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 2682e3e5db9..183011b3201 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -12,7 +12,7 @@ %% scrklang.dtx (with options: `package,body,base') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -248,7 +248,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: scrklang.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2009/03/25 v3.03} +\def\scrlfileversion{2010/11/05 v3.08} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -545,22 +545,27 @@ } \newcommand*{\Family@Options}[3]{% \@for\scr@key@atlist:=#2\do{% - \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil - \scr@key@found@false - \edef\@tempa{\csname #1@key@familylist\endcsname}% - \@for\@tempa:=\@tempa\do{% - \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{% - \scr@key@found@true - \protected@edef\reserved@a{\noexpand\setkeys{\@tempa}{\scr@key@atlist}% - \noexpand\def\noexpand\@tempa{\@tempa}% - \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}% - \noexpand\def\noexpand\scr@key@name{\scr@key@name}% - \noexpand\def\noexpand\scr@key@value{\scr@key@value}% + \ifx\scr@key@atlist\@empty\else + \ifx\scr@key@atlist\space\else + \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil + \scr@key@found@false + \edef\@tempa{\csname #1@key@familylist\endcsname}% + \@for\@tempa:=\@tempa\do{% + \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{% + \scr@key@found@true + \protected@edef\reserved@a{% + \noexpand\setkeys{\@tempa}{\scr@key@atlist}% + \noexpand\def\noexpand\@tempa{\@tempa}% + \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}% + \noexpand\def\noexpand\scr@key@name{\scr@key@name}% + \noexpand\def\noexpand\scr@key@value{\scr@key@value}% + }% + \reserved@a + }% }% - \reserved@a - }% - }% - \ifscr@key@found@\else#3\fi + \ifscr@key@found@\else#3\fi + \fi + \fi }% } \newif\ifscr@key@found@ @@ -601,7 +606,9 @@ \let\reserved@a\@empty \@for\@tempa:=#3\do{% \expandafter\KV@@sp@def\expandafter\@tempa\expandafter{\@tempa}% - \protected@edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}% + \ifx\@tempa\@empty\else + \protected@edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}% + \fi }% \ifx\reserved@a\@empty \protected@edef\reserved@a{\noexpand\setkeys{\@tempb}{\scr@key@name}}% @@ -709,6 +716,17 @@ \@tempa \let\FamilyElseValues\@empty } +\newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{% + \@ifnextchar [%] + {\Family@String@Key{#1}{#2}{#3}}{\Family@@String@@Key{#1}{#2}{#3}}% +} +\newcommand*{\Family@@String@@Key}{} +\long\def\Family@@Numerical@@Key#1#2#3[#4]#5{% + \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\def#5{##1}}% +} +\newcommand{\Family@String@Key}[4]{% + \DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}}% +} %%% From File: scrklang.dtx \newcommand*{\providecaptionname}[3]{% \@ifundefined{captions#1}{% -- cgit v1.2.3