diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty index 21662022f54..91b0c045237 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.0 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/20 v1.1 - 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 @@ -45,7 +45,7 @@ %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %% \ProvidesPackage{interfaces-base} - [2010/10/10 v1.0 Basic macros for interfaces package (FC)] + [2010/10/27 v1.2 Basic macros for interfaces package (FC)] \RequirePackage{etex,ltxcmds,etoolbox,pgfkeys,scrlfile} \AtEndOfPackage{% \RequirePackage{interfaces-etoolbox}% @@ -117,7 +117,7 @@ {#5}}% {#5}% }% \itf@preapptocmd -\def\itf@patch{\futurelet\itf@tp\itf@patch@} +\def\itf@patch{\@makeother\#\futurelet\itf@tp\itf@patch@} \def\itf@patch@{\csname itf@patch@% \ifx\itf@tp\patchcmd inside\else \ifx\itf@tp\itf@preapptocmd inside\else @@ -125,6 +125,7 @@ \endcsname }% \itf@patch@ \def\itf@patch@boundary#1#2#3#4#5{% + \catcode`\#=6% \let\itf@tp#2% #1\itf@tp{#3}% {\let#2\itf@tp @@ -133,6 +134,7 @@ {#5}% }% \itf@patch@boundary (for \pretocmd and \apptocmd) \def\itf@patch@inside#1#2#3#4#5#6{% + \catcode`\#=6% \let\itf@tp#2% #1\itf@tp{#3}{#4}% {\let#2\itf@tp @@ -178,11 +180,11 @@ }% \itf@number@@@ %% U N I T S F O R D I M E N S \def\itf@strip@mu{\expandafter\itf@rem@mu\the} -\begingroup \@makeother\M\@makeother\U - \lowercase{% - \gdef\itf@rem@mu#1.#2MU{#1\ifnum#2>\z@.#2\fi}% - }% -\endgroup +{% +\@makeother\M\@makeother\U +\lowercase{% + \gdef\itf@rem@mu#1.#2MU{#1\ifnum#2>\z@.#2\fi}% +}}% %% \skip = \itf@units@mutopt \muskip \def\itf@units@pttomu#1{\gluetomu\glueexpr \glueexpr#1\relax*1800/% @@ -197,12 +199,15 @@ \relax }% \itf@units@mutopt %% \muskip = \itf@units@mu{ \skip or \muskip or number} -\def\itf@units@mu#1#2{\begingroup\@makeother\P - \@makeother\T\@makeother\S\@makeother\B\@makeother\C - \@makeother\M\@makeother\D\@makeother\I\@makeother\N +{% +\@makeother\P\@makeother\T\@makeother\S\@makeother\B +\@makeother\C\@makeother\M\@makeother\D\@makeother\I\@makeother\N +\lowercase{% +\gdef\itf@units@mu#1#2{\begingroup \edef\itf@tp{#2}% - \lowercase{\@tfor\x:={PT}{PC}{IN}{BP}{CM}{MM}{DD}{CC}{SP}\do}{% - \@expandtwoargs\in@\x\itf@tp\ifin@\expandafter\@break@tfor\fi + \@tfor\x:={PT}{pt}{PC}{pc}{IN}{in}{BP}{bp}% + {CM}{cm}{MM}{mm}{DD}{dd}{CC}{cc}{SP}{sp}\do{% + \@expandtwoargs\in@\x\itf@tp\ifin@\@break@tfor\fi }% \expandafter\endgroup \ifin@ @@ -211,16 +216,21 @@ \@defaultunits#1 #2mu\relax\@nnil \fi }% \itf@units@mu +}} %% \skip = \itf@units@pt( \muskip or \skip or number ) -\def\itf@units@pt#1#2{\begingroup\@makeother\M\@makeother\U - \lowercase{\@expandtwoargs\in@{MU}}{#2}% +{% +\@makeother\M\@makeother\U +\lowercase{% +\gdef\itf@units@pt#1#2{\begingroup + \@expandtwoargs\in@{MU}{#2}% + \ifin@\else\@expandtwoargs\in@{mu}{#2}\fi \expandafter\endgroup \ifin@ #1=\itf@units@mutopt{#2}% \else \@defaultunits#1 #2pt\relax\@nnil \fi -}% \itf@units@pt +}}}% \itf@units@pt %% glue * 1.5 = glue * 98302 / 65536 %% glue * 3/2 = glue * 3/2 \def\itf@units@scale#1!{\itf@units@scale@normalize#1/\@nnil/\@nil} |