From 5ed19c50b43e9e945556079d31e5e88c4e2f4990 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 May 2012 22:52:57 +0000 Subject: thmtools (7may12) git-svn-id: svn://tug.org/texlive/trunk@26251 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/thmtools/thm-kv.dtx | 44 +++++++++++++++++++++- .../source/latex/thmtools/thm-listof.dtx | 2 +- 2 files changed, 43 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/thmtools/thm-kv.dtx b/Master/texmf-dist/source/latex/thmtools/thm-kv.dtx index 2dc6e484486..1e7e3580829 100644 --- a/Master/texmf-dist/source/latex/thmtools/thm-kv.dtx +++ b/Master/texmf-dist/source/latex/thmtools/thm-kv.dtx @@ -65,7 +65,47 @@ \fi } -\@ifpackagelater{kvsetkeys}{2011/04/06}{% +\@ifpackagelater{kvsetkeys}{2012/04/23}{% + \PackageInfo{thm-kv}{kvsetkeys patch (v1.16 or later)}% + \long\def\tmp@KVS@PD#1#2#3{% + \def \kv@fam {#1}% + \unless \ifcsname KV@#1@#2\endcsname + \unless \ifcsname KVS@#1@handler\endcsname + \kv@error@unknownkey {#1}{#2}% + \else + \kv@handled@true + \csname KVS@#1@handler\endcsname {#2}{#3}\relax + \ifkv@handled@ \else + \kv@error@unknownkey {#1}{#2}% + \fi + \fi + \else + \ifx \kv@value \relax + \unless \ifcsname KV@#1@#2@default\endcsname + \kv@error@novalue {#1}{#2}% + \else + \csname KV@#1@#2@default\endcsname \relax + \fi + \else + \csname KV@#1@#2\endcsname {#3}% + \fi + \fi + }% + \ifx\tmp@KVS@PD\KVS@ProcessorDefault + \let\KVS@ProcessorDefault\thmt@kv@processor@default + \def\kv@processor@default#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \@xa\let\csname ifincsname\@xa\endcsname\csname iftrue\endcsname + \edef\KVS@temp{\endgroup + \noexpand\KVS@ProcessorDefault{#1}{\etex@unexpanded{#2}}% + }% + \KVS@temp + }% + \else + \PackageError{thm-kv}{kvsetkeys patch failed}{Try kvsetkeys v1.16 or earlier} + \fi +}{\@ifpackagelater{kvsetkeys}{2011/04/06}{% % Patch has disappeared somewhere... thanksalot. \PackageInfo{thm-kv}{kvsetkeys patch (v1.13 or later)} \long\def\tmp@KVS@PD#1#2#3{% no non-etex-support here... @@ -107,7 +147,7 @@ \RequirePackage{etex} \PackageInfo{thm-kv}{kvsetkeys patch applied (pre-1.13)}% \let\kv@processor@default\thmt@kv@processor@default -} +}} % useful key handler defaults. \newcommand\thmt@mkignoringkeyhandler[1]{% diff --git a/Master/texmf-dist/source/latex/thmtools/thm-listof.dtx b/Master/texmf-dist/source/latex/thmtools/thm-listof.dtx index 6eb4921020f..2ffc1913148 100644 --- a/Master/texmf-dist/source/latex/thmtools/thm-listof.dtx +++ b/Master/texmf-dist/source/latex/thmtools/thm-listof.dtx @@ -62,7 +62,7 @@ \ifcsname c@chapter\endcsname \ifx\c@chapter\relax\else \def\thmtlo@chaptervspacehack{% - \ifnum \value{chapter}>\thmtlo@oldchapter\relax + \ifnum \value{chapter}=\thmtlo@oldchapter\relax\else % new chapter, add vspace to loe. \addtocontents{loe}{\protect\addvspace{10\p@}}% \xdef\thmtlo@oldchapter{\arabic{chapter}}% -- cgit v1.2.3