diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty | 69 |
1 files changed, 31 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty index db3f2ff5c79..b30088fa206 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/11/21 v2.3 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -44,68 +44,61 @@ %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %% \ProvidesPackage{interfaces-marks} - [2010/11/21 v2.3 easier use of e-TeX marks (FC)] + [2010/11/26 v2.4 easier use of e-TeX marks (FC)] \RequirePackage{interfaces-base} \newrobustcmd\marksthe[2]{% - \ifcsname marks@#1\endcsname\else - \itf@marks@new{#1}% - \fi - \expandafter\marks\csname marks@#1\endcsname{\unexpanded{#2}}% + \ifcsname marks@#1\endcsname \else \itf@marks@new{#1}\fi + {\toks@{#2}\expandafter\marks\csname marks@#1\endcsname{\the\toks@}}% }% \marksthe \newrobustcmd*\marksthecs[2]{% - \ifcsname marks@#1\endcsname\else - \itf@marks@new{#1}% - \fi + \ifcsname marks@#1\endcsname \else \itf@marks@new{#1}\fi \ifcsundef{#2} {} - {\expandafter\marks\csname marks@#1\endcsname{% - \unexpanded\expandafter\expandafter\expandafter{% - \csname#2\endcsname}}}% + {{\toks@\expandafter\expandafter\expandafter{% + \csname #2\endcsname}% + \expandafter\marks\csname marks@#1\endcsname{\the\toks@}}}% }% \marksthecs \def\itf@marks@new#1{% \expandafter\newmarks\csname marks@#1\endcsname - \PackageInfo{interfaces-marks} - {New marks `#1' defined} -}% \itf@marks@warning -\newcommand*\thefirstmarks[1]{% - \ifcsname marks@#1\endcsname - \expandafter\firstmarks\csname marks@#1\endcsname + \PackageInfo{interfaces-marks}{New marks `#1' defined}% +}% \itf@marks@new +\newcommand*\thefirstmarks[1]{\romannumeral + \ifcsname marks@#1\endcsname \expandafter\z@ + \firstmarks\csname marks@#1\expandafter\endcsname + \else \expandafter\z@ \fi }% \thefirstmarks -\newcommand*\thebotmarks[1]{% - \ifcsname marks@#1\endcsname - \expandafter\botmarks\csname marks@#1\endcsname +\newcommand*\thebotmarks[1]{\romannumeral + \ifcsname marks@#1\endcsname \expandafter\z@ + \botmarks\csname marks@#1\expandafter\endcsname + \else \expandafter\z@ \fi }% \thebotmarks -\newcommand*\thetopmarks[1]{% - \ifcsname marks@#1\endcsname - \expandafter\topmarks\csname marks@#1\endcsname +\newcommand*\thetopmarks[1]{\romannumeral + \ifcsname marks@#1\endcsname \expandafter\z@ + \topmarks\csname marks@#1\expandafter\endcsname + \else \expandafter\z@ \fi }% \thetopmarks %% \getthemarks\firstmarks{section}\macro \newrobustcmd*\getthemarks[3]{% \ifcsname marks@#2\endcsname - \expandafter\itf@getthemarks\expandafter#1\csname marks@#2\endcsname{#3}% + \edef#3{\unexpanded\expandafter{#1\csname marks@#2\endcsname}}% \else \let#3\@undefined \fi }% \getthemarks -\def\itf@getthemarks#1#2#3{% - \expandafter\def\expandafter#3\expandafter{#1#2}% -}% \itf@getthemarks -\newrobustcmd*\getthefirstmarks[2]{\getthemarks\firstmarks{#1}{#2}} -\newrobustcmd*\getthebotmarks[2]{\getthemarks\botmarks{#1}{#2}} -\newrobustcmd*\getthetopmarks[2]{\getthemarks\topmarks{#1}{#2}} +\newrobustcmd*\getthefirstmarks{\getthemarks\firstmarks} +\newrobustcmd*\getthebotmarks{\getthemarks\botmarks} +\newrobustcmd*\getthetopmarks{\getthemarks\topmarks} %% \ifmarksequal\firstmarks\botmarks{subsection}{ true }{ false } \newrobustcmd*\ifmarksequal[3]{% \begingroup - \getthemarks{#1}{#3}\@tempa - \getthemarks{#2}{#3}\@tempb + \getthemarks{#1}{#3}\x + \getthemarks{#2}{#3}\y \expandafter\endgroup - \csname ltx@\ifdefined\@tempa\ifdefined\@tempb - \ifx\@tempa\@tempb first\else - second\fi\else - second\fi\else - second\fi + \csname ltx@\ifdefined\x\ifdefined\y + \ifx\x\y first\else + second\fi\else second\fi\else second\fi oftwo\endcsname }% \ifmarksequal \endinput |