diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-06-25 11:34:57 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-06-25 11:34:57 +0000 |
commit | 47f4481a23ad516f02cbd8a8bd2a2c180a1ac883 (patch) | |
tree | c96ec730f8c3173be622dc99c56335a40c18f221 /Master/texmf-dist/tex/latex/thmtools/thm-patch.sty | |
parent | 7f6c139bbdbbbcee9140892f8fad3584d63cf446 (diff) |
thmtools patch update v0.1beta6 2008/06/22
git-svn-id: svn://tug.org/texlive/trunk@9040 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/thmtools/thm-patch.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/thmtools/thm-patch.sty | 122 |
1 files changed, 87 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty b/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty index 7b5315388e9..bc8d171a2c4 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty @@ -19,51 +19,83 @@ %% http://www.latex-project.org/lppl/lppl-1-3a.txt %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{thm-patch}[2008/02/17 BETA thm-patch (ulmi)] +\ProvidesPackage{thm-patch}[2008/06/22 v0.1beta6 thm-patch (ulmi)] \let\@xa=\expandafter \let\@nx=\noexpand +\RequirePackage{parseargs} \@ifundefined{c@thmt@dummyctr}{% \newcounter{thmt@dummyctr}% }{}% \gdef\theHthmt@dummyctr{dummy.\arabic{thmt@dummyctr}}% +\gdef\thethmt@dummyctr{}% \newif\ifthmt@isstarred \newif\ifthmt@hassibling \newif\ifthmt@hasparent +\@ifundefined{beamer@version}{% + \def\thmt@parsetheoremargs#1{% + \parse{% + {\parseOpt[]{\def\thmt@optarg{##1}}{\let\thmt@optarg\@empty}}% + {% + \csname thmt@#1@preheadhook\endcsname + \thmt@generic@preheadhook + \protected@edef\tmp@args{% + \ifx\@empty\thmt@optarg\else [\thmt@optarg]\fi + }% + \csname thmt@original@#1\@xa\endcsname\tmp@args + \csname thmt@#1@postheadhook\endcsname + \thmt@generic@postheadhook + \let\@parsecmd\@empty + }% + }% + }% +}{% + \newif\ifthmt@hasoverlay + \def\thmt@parsetheoremargs#1{% + \parse{% + {\parseOpt<>{\thmt@hasoverlaytrue\def\thmt@overlay{##1}}{}}% + {\parseOpt[]{\def\thmt@optarg{##1}}{\let\thmt@optarg\@empty}}% + {\ifthmt@hasoverlay\expandafter\@gobble\else\expandafter\@firstofone\fi + {\parseOpt<>{\thmt@hasoverlaytrue\def\thmt@overlay{##1}}{}}% + }% + {% + \csname thmt@#1@preheadhook\endcsname + \thmt@generic@preheadhook + \protected@edef\tmp@args{% + \ifthmt@hasoverlay <\thmt@overlay>\fi + \ifx\@empty\thmt@optarg\else [\thmt@optarg]\fi + }% + \csname thmt@original@#1\@xa\endcsname\tmp@args + \csname thmt@#1@postheadhook\endcsname + \thmt@generic@postheadhook + \let\@parsecmd\@empty + }% + } + }% +} + \let\thmt@original@newtheorem\newtheorem \def\newtheorem{% \thmt@isstarredfalse - \let\thmt@sibling=\relax \thmt@hassiblingfalse - \let\thmt@parent=\relax \thmt@hasparentfalse - \@ifstar - {\thmt@isstarredtrue\thmt@newtheoremii}% - {\thmt@newtheoremii}% -} -\newcommand\thmt@newtheoremii[1]{% - \def\thmt@envname{#1}% - \thmt@newtheoremiii -} -\newcommand\thmt@newtheoremiii[2][]{% - \def\thmt@thmname{#2}% - \ifx&\else - \thmt@hassiblingtrue - \def\thmt@sibling{#1}% - \fi - \@ifnextchar[{% - \thmt@hasparenttrue - \def\tmp@a[####1]{\def\thmt@parent{####1}\thmt@newtheoremiv}% - \tmp@a - }{% - \thmt@newtheoremiv + \thmt@hassiblingfalse + \thmt@hasparentfalse + \parse{% + {\parseFlag*{\thmt@isstarredtrue}{}}% + {\parseMand{\def\thmt@envname{##1}}}% + {\parseOpt[]{\thmt@hassiblingtrue\def\thmt@sibling{##1}}{}}% + {\parseMand{\def\thmt@thmname{##1}}}% + {\parseOpt[]{\thmt@hasparenttrue\def\thmt@parent{##1}}{}}% + {\let\@parsecmd\thmt@newtheoremiv}% }% } + \newcommand\thmt@newtheoremiv{% \thmt@newtheorem@predefinition % whee, now reassemble the whole shit. \protected@edef\thmt@args{% - \@nx\thmt@original@newtheorem% + \@nx\thmt@theoremdefiner% \ifthmt@isstarred *\fi {\thmt@envname}% \ifthmt@hassibling [\thmt@sibling]\fi @@ -84,7 +116,7 @@ \def\@nx\thmt@envname{\thmt@envname}% \def\@nx\thmt@thmname{\thmt@thmname}% } - \@xa\addtotheoremprehook\@xa[\@xa\thmt@envname\@xa]\@xa{% + \@xa\addtotheorempreheadhook\@xa[\@xa\thmt@envname\@xa]\@xa{% \thmt@tmp }% } @@ -92,28 +124,48 @@ % this adds two command calls to the newly-defined theorem. \@xa\let\csname thmt@original@#1\@xa\endcsname \csname#1\endcsname - \@xa\renewcommand\csname \thmt@envname\endcsname[1][]{% - \def\thmt@optarg{##1}% - \csname thmt@#1@preheadhook\endcsname - \thmt@generic@preheadhook - \csname thmt@original@#1\@xa\endcsname - \ifx\@empty\thmt@optarg\else [##1]\fi - \csname thmt@#1@postheadhook\endcsname - \thmt@generic@postheadhook + \@xa\renewcommand\csname #1\endcsname{ + \thmt@parsetheoremargs{#1}% }% + \@xa\let\csname thmt@original@end#1\@xa\endcsname\csname end#1\endcsname + \@xa\def\csname end#1\endcsname{% + % these need to be in opposite order of headhooks. + \csname thmtgeneric@prefoothook\endcsname + \csname thmt@#1@prefoothook\endcsname + \csname thmt@original@end#1\endcsname + \csname thmt@generic@postfoothook\endcsname + \csname thmt@#1@postfoothook\endcsname + } \@namedef{thmt@#1@preheadhook}{}% \@namedef{thmt@#1@postheadhook}{}% + \@namedef{thmt@#1@prefoothook}{}% + \@namedef{thmt@#1@postfoothook}{}% } \newcommand\thmt@generic@preheadhook{\refstepcounter{thmt@dummyctr}} \newcommand\thmt@generic@postheadhook{} -\newcommand\addtotheoremprehook[1][generic]{% +\providecommand\g@prependto@macro[2]{% + \begingroup + \toks@\@xa{\@xa{#1}{#2}}% + \def\tmp@a##1##2{##2##1}% + \@xa\@xa\@xa\gdef\@xa\@xa\@xa#1\@xa\@xa\@xa{\@xa\tmp@a\the\toks@}% + \endgroup +} + +\newcommand\addtotheorempreheadhook[1][generic]{% \expandafter\g@addto@macro\csname thmt@#1@preheadhook\endcsname% } -\newcommand\addtotheoremposthook[1][generic]{% +\newcommand\addtotheorempostheadhook[1][generic]{% \expandafter\g@addto@macro\csname thmt@#1@postheadhook\endcsname% } +\newcommand\addtotheoremprefoothook[1][generic]{% + \expandafter\g@prependto@macro\csname thmt@#1@prefoothook\endcsname% +} +\newcommand\addtotheorempostfoothook[1][generic]{% + \expandafter\g@prependto@macro\csname thmt@#1@postfoothook\endcsname% +} + \endinput %% %% End of file `thm-patch.sty'. |