diff options
Diffstat (limited to 'Master')
27 files changed, 551 insertions, 405 deletions
diff --git a/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex b/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex index 387e73fbc4f..d613aeb5ddd 100644 --- a/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex +++ b/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex @@ -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 @@ -44,8 +44,8 @@ %% interfaces: interfaces with keys for other packages (FC) %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %% -\ProvidesFile{hypbmsec.code.tex} - [2010/10/05 v1.0 code for interfaces-hypbmsec (FC)] +\ProvidesFile{interfaces-hypbmsec.code.tex} + [2010/10/27 v1.2 code for interfaces-hypbmsec (FC)] \itf@patch\pretocmd\hbs@do{% \edef\itf@tp{\expandafter\itf@strip@at\string#1}% }% @@ -55,7 +55,7 @@ {Command \string\hbs@do\space could not be patched \MessageBreak loading of `interfaces-hypbmsec` aborted \MessageBreak \string\lastsection\space will not work}% - \endinput}% + \endinput} \itf@patch\pretocmd\hbs@process{% \itf@hbs@next{#1}% }% @@ -68,81 +68,61 @@ \endinput}% \long\def\itf@hbs@next#1{% \csdef{itf@next\itf@tp title}{#1}% - \ifx\hbs@tocstring\relax - \csletcs{itf@next\itf@tp toc}{itf@next\itf@tp}% - \else - \cslet{itf@next\itf@tp toc}\hbs@tocstring - \fi - \ifx\hbs@bmstring\relax - \csletcs{itf@next\itf@tp bookmark}{itf@next\itf@tp toc}% - \else - \cslet{itf@next\itf@tp bookmark}\hbs@bmstring - \fi + \expandafter\let\csname itf@next\itf@tp toc\expandafter\endcsname + \csname + \ifx\hbs@tocstring\relax itf@next\itf@tp title\else + hbs@tocstring\fi + \endcsname + \expandafter\let\csname itf@next\itf@tp bookmark\expandafter\endcsname + \csname + \ifx\hbs@bmstring\relax itf@next\itf@tp toc\else + hbs@bmstring\fi + \endcsname \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter \expandafter\itf@hbs@chkclass \expandafter\expandafter\expandafter\string \expandafter\hbs@seccmd\string\ttl@\@nil - {} {\expandafter\itf@last@from@next\expandafter{\itf@tp}}% }% \itf@hbs@next -\edef\itf@tp{% - \long\def\noexpand\itf@hbs@chkclass##1\string\ttl@##2\noexpand\@nil{% - \noexpand\ifblank{##1}% - }% \itf@hbs@chkclass -}\itf@tp -\itf@patch\pretocmd\ttl@select{% - \itf@last@from@next{#1}} - {\PackageInfo{interfaces-hypbmsec} - {Command \string\ttl@select\space successfully patched}} - {\PackageWarning{interfaces-hypbmsec} - {Command \string\ttl@select\space could not be patched - \MessageBreak loading of `interfaces-hypbmsec` aborted - \MessageBreak \string\lastsection\space will not work}% - \endinput}% +\long\expandafter\def\expandafter\itf@hbs@chkclass + \expandafter#\expandafter1\string\ttl@#2\@nil{% + \ifblank{#1}{\if@nobreak\itf@hbs@nobreakfix#2\@nnil\fi}% +}% \itf@hbs@chkclass +\def\itf@hbs@nobreakfix#1#{\itf@hbs@n@breakfix} +\def\itf@hbs@n@breakfix#1#2\@nnil{% + \unless\ifx\lastsectionname\relax + \unless\ifnum\csname ttll@#1\endcsname > \csname ttll@\lastsectionname\endcsname\relax + \@nobreakfalse + \fi\fi +}% \itf@hbs@nobreakfix \def\itf@last@from@next#1{% - \expandafter\let\csname last#1title\expandafter\endcsname + \gdef\lastsectionname{#1}% + \global\expandafter\let\csname last#1title\expandafter\endcsname \csname itf@next#1title\endcsname - \expandafter\let\csname itf@last#1toc\expandafter\endcsname + \global\expandafter\let\csname last#1toc\expandafter\endcsname \csname itf@next#1toc\endcsname - \expandafter\let\csname last#1bookmark\expandafter\endcsname + \global\expandafter\let\csname last#1bookmark\expandafter\endcsname \csname itf@next#1bookmark\endcsname - \expandafter\def\csname lastsectionname\endcsname{#1}% + \let\@elt\itf@resetlastsections + \csname cl@#1\endcsname }% \itf@last@from@next -%%----------------------------------------------------------------------------- -%% \lastsection reinitialization (at \stepcounter-> \cl@section) -\def\itf@hbs@resetlast#1{% - \ifcsname last#1\endcsname - \global\expandafter\let - \csname last#1\endcsname\@empty - \fi -}% \itf@hbs@resetlast -\def\itf@hbs@reset#1{% - \itf@hbs@resetlast{#1title}% - \itf@hbs@resetlast{#1bookmark}% - \itf@hbs@resetlast{#1toc}% - \csuse{cl@#1}% -}% \itf@hbs@reset -\let\ltx@stpelt\@stpelt -\def\itf@hbs@stpelt#1{% - \let\@elt\itf@hbs@reset - \@elt{#1}% - \let\@elt\itf@stpelt -}% \itf@hbs@stpelt -\def\itf@stpelt#1{% - \ltx@stpelt{#1}% - \itf@hbs@stpelt{#1}% -}% \itf@stpelt -\let\@stpelt\itf@stpelt -%%----------------------------------------------------------------------------- +\def\itf@resetlastsections#1{% + \expandafter\let\csname last#1title\endcsname\relax + \expandafter\let\csname last#1toc\endcsname\relax + \expandafter\let\csname last#1bookmark\endcsname\relax + \csname cl@#1\endcsname +}% \itf@resetlastsections +\let\lastsectionname\relax \@for\itf@tp:=part,section,subsection,subsubsection,paragraph,subparagraph% - \do{\global\expandafter\let\csname last\itf@tp title\endcsname\@empty - \global\expandafter\let\csname last\itf@tp toc\endcsname\@empty - \global\expandafter\let\csname last\itf@tp bookmark\endcsname\@empty}% + \do{\expandafter\let\csname last\itf@tp title\endcsname\relax + \expandafter\let\csname last\itf@tp toc\endcsname\relax + \expandafter\let\csname last\itf@tp bookmark\endcsname\relax + }% \AtBeginDocument{\ifundef\chapter{} - {\global\let\lastchaptertitle\@empty - \global\let\lastchaptertoc\@empty - \global\let\lastchapterbookmark\@empty}% + {\let\lastchaptertitle\relax + \let\lastchaptertoc\relax + \let\lastchapterbookmark\relax}% }% \endinput %% diff --git a/Master/texmf-dist/doc/latex/interfaces/interfaces.pdf b/Master/texmf-dist/doc/latex/interfaces/interfaces.pdf Binary files differindex dfd53c0b666..7342269c8e8 100644 --- a/Master/texmf-dist/doc/latex/interfaces/interfaces.pdf +++ b/Master/texmf-dist/doc/latex/interfaces/interfaces.pdf diff --git a/Master/texmf-dist/source/latex/interfaces/interfaces.drv b/Master/texmf-dist/source/latex/interfaces/interfaces.drv index 20c3635f9b5..7ad3d19c56f 100644 --- a/Master/texmf-dist/source/latex/interfaces/interfaces.drv +++ b/Master/texmf-dist/source/latex/interfaces/interfaces.drv @@ -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 @@ -47,8 +47,8 @@ \let\CTANLinks=y \edef\thisfile{\jobname} \def\thisinfo{interfaces with keys for other packages (\FC)} -\def\thisdate{2010/10/20} -\def\thisversion{1.0} +\def\thisdate{2010/10/27} +\def\thisversion{1.2} \def\CTANbaseurl{http://www.ctan.org/tex-archive/} \def\LocalOrCTAN#1#2{\ifx y\CTANLinks#2\else#1\fi} \def\LOCALDOC{file:C:/texmf/doc/latex} @@ -58,31 +58,26 @@ \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} +\usepackage{txfonts,times,marvosym,wasysym,pifont,bbding,nicefrac,numprint} +\usepackage[expansion=all,protrusion=none,shrink=50,stretch=20]{microtype} \PassOptionsToPackage{svgnames}{xcolor} -\usepackage{etoolbox,geometry,lastpage,tocloft,titlesec,graphicx,xspace,tabularx} -\usepackage{fancyhdr,nicefrac,xcolor,bbding,moresize,relsize,embedfile} -\usepackage{enumitem,framed,multirow,txfonts,makecell,enumitem,atveryend,marvosym,pifont} -\usepackage{booktabs} -\usepackage{calc} -\usepackage{colortbl,arydshln,dcolumn,delarray} -\usepackage{hypbmsec} -\usepackage{linegoal} -\usepackage{numprint} +\usepackage{etoolbox,atveryend,calc} +\usepackage{graphicx,xspace,xcolor,framed} +\usepackage{geometry,lastpage,tocloft,titlesec,hypbmsec,fancyhdr,moresize,relsize} +\usepackage{enumitem,multirow,makecell,tabularx,booktabs,colortbl,arydshln,dcolumn,delarray,hhline,linegoal} \usepackage[breakall]{truncate} \usepackage{appendix} -\usepackage[hyperindex=false,pdfusetitle,colorlinks,pdfpagelabels,pdfencoding=auto]{hyperref} \usepackage{interfaces-base} \LoadInterface{LaTeX,titlesec,bookmark,marks,fancyhdr,tocloft,makecell,enumitem,appendix,truncate} +\usepackage{holtxdoc,hyperref,bookmark} +\usepackage{embedfile} \usepackage{fp} \usepackage{zref,zref-user,zref-savepos} +\usetikz{basic,decorations.pathmorphing} \csname endofdump\endcsname %%\FPmessagesfalse -\usepackage{times} -\usepackage{holtxdoc} -\usepackage{hhline} \CodelineNumbered \usepackage{fancyvrb} \fvset{gobble=1} -\usetikz{basic,decorations.pathmorphing} \lastlinefit999 \widowpenalty5000 \clubpenalty10000 \doublehyphendemerits100000 \geometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm} \hypersetup{% @@ -99,7 +94,6 @@ umrand},% bookmarksopen=true,bookmarksopenlevel=1,% pdfnewwindow=true} -\usepackage{bookmark} \embedfile{\thisfile.dtx} \begin{document} \DocInput{\thisfile.dtx} diff --git a/Master/texmf-dist/source/latex/interfaces/interfaces.dtx b/Master/texmf-dist/source/latex/interfaces/interfaces.dtx index 422ef8a57e3..e7352ad0782 100644 --- a/Master/texmf-dist/source/latex/interfaces/interfaces.dtx +++ b/Master/texmf-dist/source/latex/interfaces/interfaces.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% interfaces : 2010/10/20 v1.0 - interfaces with keys for other packages (FC) +% interfaces : 2010/10/27 v1.2 - 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 @@ -57,7 +57,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: 2010/10/20 v1.0 - interfaces: interfaces with keys for other packages (FC)} +\Msg{* Package: 2010/10/27 v1.2 - interfaces: interfaces with keys for other packages (FC)} \Msg{************************************************************************} \keepsilent @@ -68,7 +68,7 @@ This is a generated file. -interfaces : 2010/10/20 v1.0 - interfaces : interfaces with keys for other packages (FC) +interfaces : 2010/10/27 v1.2 - 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 @@ -163,8 +163,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \let\CTANLinks=y \edef\thisfile{\jobname} \def\thisinfo{interfaces with keys for other packages (\FC)} -\def\thisdate{2010/10/20} -\def\thisversion{1.0} +\def\thisdate{2010/10/27} +\def\thisversion{1.2} \def\CTANbaseurl{http://www.ctan.org/tex-archive/} \def\LocalOrCTAN#1#2{\ifx y\CTANLinks#2\else#1\fi} \def\LOCALDOC{file:C:/texmf/doc/latex} @@ -174,31 +174,26 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} +\usepackage{txfonts,times,marvosym,wasysym,pifont,bbding,nicefrac,numprint} +\usepackage[expansion=all,protrusion=none,shrink=50,stretch=20]{microtype} \PassOptionsToPackage{svgnames}{xcolor} -\usepackage{etoolbox,geometry,lastpage,tocloft,titlesec,graphicx,xspace,tabularx} -\usepackage{fancyhdr,nicefrac,xcolor,bbding,moresize,relsize,embedfile} -\usepackage{enumitem,framed,multirow,txfonts,makecell,enumitem,atveryend,marvosym,pifont} -\usepackage{booktabs} -\usepackage{calc} -\usepackage{colortbl,arydshln,dcolumn,delarray} -\usepackage{hypbmsec} -\usepackage{linegoal} -\usepackage{numprint} +\usepackage{etoolbox,atveryend,calc} +\usepackage{graphicx,xspace,xcolor,framed} +\usepackage{geometry,lastpage,tocloft,titlesec,hypbmsec,fancyhdr,moresize,relsize} +\usepackage{enumitem,multirow,makecell,tabularx,booktabs,colortbl,arydshln,dcolumn,delarray,hhline,linegoal} \usepackage[breakall]{truncate} \usepackage{appendix} -\usepackage[hyperindex=false,pdfusetitle,colorlinks,pdfpagelabels,pdfencoding=auto]{hyperref} \usepackage{interfaces-base} \LoadInterface{LaTeX,titlesec,bookmark,marks,fancyhdr,tocloft,makecell,enumitem,appendix,truncate} +\usepackage{holtxdoc,hyperref,bookmark} +\usepackage{embedfile} \usepackage{fp} \usepackage{zref,zref-user,zref-savepos} +\usetikz{basic,decorations.pathmorphing} \csname endofdump\endcsname %%\FPmessagesfalse -\usepackage{times} -\usepackage{holtxdoc} -\usepackage{hhline} \CodelineNumbered \usepackage{fancyvrb} \fvset{gobble=1} -\usetikz{basic,decorations.pathmorphing} \lastlinefit999 \widowpenalty5000 \clubpenalty10000 \doublehyphendemerits100000 \geometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm} \hypersetup{% @@ -215,7 +210,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> umrand},% bookmarksopen=true,bookmarksopenlevel=1,% pdfnewwindow=true} -\usepackage{bookmark} \embedfile{\thisfile.dtx} \begin{document} \DocInput{\thisfile.dtx} @@ -223,7 +217,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %</driver> % \fi % -% \CheckSum{5834} +% \CheckSum{5859} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -262,12 +256,36 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \DoNotIndex{\",\:,\@empty,\@for,\@gtempa,\@latex@error,\@namedef,\@nameuse,\@tempa,\@testopt,\@width,\\,\m@ne,\makeatletter,\makeatother} % \DoNotIndex{\maketitle,\parindent,\setbox,\x,\kernel@ifnextchar} % \DoNotIndex{\KVS@CommaComma,\KVS@CommaSpace,\KVS@EqualsSpace,\KVS@Equals,\KVS@Global,\KVS@SpaceEquals,\KVS@SpaceComma,\KVS@Comma} -% \DoNotIndex{\DefineShortVerb,\DeleteShortVerb,\UndefineShortVerb,\MakeShortVerb,\endinput} +% \DoNotIndex{\DefineShortVerb,\DeleteShortVerb,\UndefineShortVerb,\MakeShortVerb,\endinput,\Verb,\VerbLines,\T,\x,\y,\U,\tw@,\ttl@,\q,\quad,\ps@} +% \DoNotIndex{\plainfootrulewidth,\plainheadrulewidth,\ProcessOptions,\providerobustcmd,\pgfqkeys,\pgfkeys,\pgfkeysvalueof,\pgfkeysnovalue@text,\pgfkeyslet} +% \DoNotIndex{\pgfkeysifdefined,\pgfkeysEsetvalue,\pgfkeysedef,\pgfkeysdef,\pgfkeyscurrentvalue,\pgfkeyscurrentpath,\pgfkeyscurrentname,\pgfkeyscurrentkey} +% \DoNotIndex{\pgfkeysalso,\pgfkeysaddvalue,\pgfkeys@unknown,\pgfkeys@temp,\pgfkeys@stop,\pgfkeys@split@path,\pgfkeys@empty,\pgfkeys@code,\pgfkeys@case@one} +% \DoNotIndex{\pgfkeys@add@path@as@needed,\parfillskip,\PackageWarning,\PackageInfo,\PackageError,\p@,\P} +% \DoNotIndex{\numexpr,\number,\newrobustcmd,\N,\M,\meaning,\ltx@leavevmode,\ltx@newif,\ltx@secondoftwo,\lowercase,\letcs,\lccode,\LaTeX,\l@,\l@sup,\l@newsection} +% \DoNotIndex{\keep,\jobname,\itf@tp,\itf@thecr,\itf@tempdim,\itf@sum,\itf@rows,\itf@cols,\itf@row,\itf@col,\itf@pgfkeysaddvalue,\itf@pgfkeys@unpack} +% \DoNotIndex{\itf@pgfkeys@exp@call,\itf@pgfkeys@choice,\itf@pgfkeys,\itf@patch@inside,\itf@patch@boundary,\itf@p@gesetup,\itf@number@@@,\itf@number@,\itf@newif} +% \DoNotIndex{\itf@LoadFile,\itf@LoadInterface,\itf@istruncated,\itf@getv@lue,\itf@freespace,\itf@exp@ndonceifcs,\itf@endappendices@pp,\itf@Embed@ne,\itf@EmbedOne} +% \DoNotIndex{\itf@defpreapp,\itf@cnt,\itf@Check@Package,\itf@cft@section@name,\itf@cft@sec@name,\itf@cft@sectionname,\itf@cellfontrow,\itf@cellfontcol,\itf@cell@rowcolkey} +% \DoNotIndex{\itf@cell@getifdefined,\itf@cell@getf@rmula,\itf@BKM@@ref,\itf@BKM@@pageref,\itf@AtEnd,\itf@appendices@pp,\itf@@cellright,\itf@@cellleft,\InputIfFileExists} +% \DoNotIndex{\in@true,\in@false,\in@@,\in@@@,\immediate,\iftrue,\ifnum,\ifin@,\ifdim,\ifcsname,\ifcase,\ifcat,\ifblank,\if@chapter@pp,\if@fancyplain,\if@cftsubfigopt} +% \DoNotIndex{\hyper@anchorend,\hyper@anchorstart,\Hy@raisedlink,\Hy@babelnormalise,\Hy@AnchorName,\hfuzz,\hbs@tocstring,\hbs@bmstring,\hbs@seccmd,\hbs@process,\hbs@do} +% \DoNotIndex{\hbadness,\G@refundefinedtrue,\getpagerefnumber,\expandonce,\ExecuteOptions,\etb@doitem,\enit@a,\enit@b,\endVerb,\endVerbLines,\endappendices} +% \DoNotIndex{\embedthisfile@main,\embedthisfile@all,\document,\docsvlist,\dimexpr,\dimen@,\detokenize,\define@key,\DeclareOption,\D,\crcr,\count@,\catcode,\BKM@startatroottrue} +% \DoNotIndex{\badness,\b,\B,\AtEndPreamble,\AtEndOfPackage,\arraybackslash,\array@prepnext@tok,\apptocs,\appto,\appendixpagename,\appendixtocname,\AfterPreamble} +% \DoNotIndex{\AfterEndPreamble,\addcontentsline,\a,\@undefined,\@temptokena,\@tempcnta,\@tempb,\@specialstyle,\@specialpagetrue,\@rightskip,\@ptionlist,\@preamble} +% \DoNotIndex{\@nnil,\@nil,\@makeother,\@listfiles,\@let@token,\@latex@warning,\@input,\@ifundefinedcolor,\@ifundefined,\@ifpackagewith,\@ifnextchar,\@height,\@width,\@depth} +% \DoNotIndex{\@firstoftwo,\@secondoftwo,\@enddocumenthook,\@ehd,\@eha,\@dotoc@pptrue,\@dotoc@ppfalse,\@dopage@pptrue,\@dopage@ppfalse,\@declaredoptions,\@currentHref} +% \DoNotIndex{\@currentlabel,\@currentlabelname,\@currenvir,\@classz,\@chapter@pptrue,\@chapter@ppfalse,\@cftmaketoctitle,\@cftmakelottitle,\@cftmakeloftitle,\@arrayright} +% \DoNotIndex{\@arabic,\@M,\&,\#,\!,\thr@@,\z@skip,\unexpanded,\typeout,\ttl@select,\ttl@savetitle,\ttl@a,\vbox,\preto,\pgfkeyssetvalue,\pgfkeysgetvalue} +% \DoNotIndex{\pgfkeysdefaultpath,\pgfkeys@spdef,\pgfeov,\S,\scr@set@load@hook,\setlist,\romannumeral,\robustify,\renewrobustcmd,\ps@@fancy,\protected,\newlistentry,\newcount} +% \DoNotIndex{\macro,\ltx@ifundefined,\leftmargin,\itf@ttl@get@format,\itf@trunc@width,\itf@trunc@nosuchwidth,\itf@set@bottomtitle@space,\itf@sectionf@rmat} +% \DoNotIndex{\itf@s@LoadFile,\itf@rowloop,\itf@colloop,\itf@patch@,\itf@number@@,\itf@marks@warning,\itf@cft@sectionname,\itf@cft@name,\itf@cellfont,\itf@celltext} +% \DoNotIndex{\itf@cellskip,\itf@cellrow,\itf@cellcol,\itf@cell,\itf@AfterPackage,\input,\IfFileExists,\iffalse,\I,\hrule,\gpreto,\glueexpr,\fancy@gbl} +% \DoNotIndex{\afterassignment,\csxdef,\cslet,\csletcs,\csgdef,\csedef,\csdef,\csappto,\csundef,\csuse,\ClassError,\cl@section,\~} % \makeatletter % % -% \colorlet{pkgcolor}{teal} -% \protected\def\pkgcolor{\color{pkgcolor}} +% \colorlet{pkgcolor}{teal} \protected\def\pkgcolor{\color{pkgcolor}} % \def\descfont{\normalfont\bfseries} % \newrobustcmd*\FC{{\color{copper}\usefont{T1}{fts}xn FC}} % \newrobustcmd*\CTANhref[2][macros/latex/contrib/]{^^A @@ -423,7 +441,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \newrobustcmd\use@package[2][]{\hbox{\cs[\lk]{usepackage}\M*{{#1{\xpackage{#2}}}}}} % \pagesetup[corpus]{% % head/rule/width=.4pt, -% head/font=\footnotesize\color[gray]{.35},% +% left/offset=1cm, +% head/font=\scriptsize\color[gray]{.35},% % foot/font=\scriptsize\color[gray]{.35},% % head/left=The \thispackage package -- \thisinfo,% % head/right=\thefirstmarks{section},% @@ -437,14 +456,16 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % head=, % } % -% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.00,0.00,0.10} +% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.05,0.02,0.07} % \newrobustcmd*\IMPLEMENTATION{% % \clearpage % \hypersetup{bookmarksopenlevel=2} % ^^A\geometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm} % \newgeometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=4cm,right=.5cm} % \pagesetup*{% -% pagestyle=corpus, +% ^^Apagestyle=corpus, +% left/offset+=1.5cm, +% right/offset-=.5cm, % head/left=The \thispackage package (implementation) -- \thisinfo, % head/right/font+=\smaller, % head/right=\thefirstmarks{subsection}, @@ -468,6 +489,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \def\Section[#1](#2)[#3]#4{% % \expandafter\providecommand\csname itf@section@#1\endcsname{({#2})[{#3}]{#4}}% % \section({#2})[{#3}]{#4}% +% \label{#1}% % } % \newrobustcmd*\Subsection[1][]{\ifcsundef{itf@section@#1} % {\errmessage{cle de section #1 non definie!}} @@ -569,8 +591,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % bookmark={bold,color=blue},$com(interfaces-bookmark) % top=6pt plus3pt minus2pt, % bottom=3pt plus2pt, -% break=\goodbreak, -% mark=\markboth{#1}{#1},% +% break=\marksthecs{section}{($db(lastsectiontitle))},$com(interfaces-hypbmsec) +% mark=($db(\marksthe)){section}{#1},$com(interfaces-marks) % } % ($red(\sectionformat))\subsection[hang]{ % label=, labelsep=, @@ -580,6 +602,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % bottom$stform+=0pt plus4pt,$com(add to previous value) % mark=\markright{#1}, % } +% \end{SaveVerbatim} +% \begin{SaveVerbatim}[gobble=1,commandchars=$()]{SecondCol} % ($red(\sectionformat))\MiniSection{$com(new sectionning command) % class=straight[\subparagraph], % shape=block, @@ -591,8 +615,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % mark=($db(\marksthe)){MiniSection}{#1},$com(see interfaces-marks) % } % ($red(\bottomtitles))=.2\textheight -% \end{SaveVerbatim} -% \begin{SaveVerbatim}[gobble=1,commandchars=$()]{SecondCol} % ($red(\tocsetup)){ % depth=3, title=Contents, pagenumbers=on, % pagestyle=plain,$com(first page style: tocloftpagestyle) @@ -604,13 +626,15 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % section/leaders,section/dotsep, % subsection/indent=2em, % subsection/number/width=2.5em, -% subsubsection/font=\scriptsize, -% subsection/leaders,subsection/dotsep, +% subsubsection/font=\scriptsize, +% subsection/leaders,subsection/dotsep,$com(default values) % subsubsection/pagenumbers=off,$com(no page numbers) % subsubsection/dotsep=,$com(no leader) % columns=2,$com(same as twocolumns) % columns/sep=.5em, -% columns/rule=1pt,columns/rule/color=blue, +% columns/rule/width=1pt,columns/rule/color=blue, +% label=toc,$com(gives a label to the t.o.c.) +% bookmark={text=Contents,bold},$com(interfaces-bookmark) % } % \tableofcontents % @@ -618,13 +642,14 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \end{SaveVerbatim} % \begin{multicols}{2} % \UseVerbatim{FirstCol} +% \columnbreak % \UseVerbatim{SecondCol} % \end{multicols} % } % \clearpage % % \tocsetup{ -% title=\leavevmode\leaders\hrule height3.4pt depth-3pt\hfill\quad Contents\quad \leaders\hrule height3.4pt depth-3pt\hfill\null, +% title=\leavevmode{\pkgcolor\leaders\hrule height3.4pt depth-3pt\hfill}\quad Contents\quad {\pkgcolor\leaders\hrule height3.4pt depth-3pt\hfill\null}, % title/bottom=3pt, % before=\enlargethispage\baselineskip, % depth=3, @@ -636,8 +661,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % subsubsection/dotsep=,subsubsection/pagenumbers=off, % section/leaders,section/dotsep, % twocolumns, -% columns/rule/color=pkgcolor, -% after=\vskip12pt\nobreak\hrule height3.4pt depth-3pt\relax, +% columns/rule/color=pkgcolor,columns/rule=.4pt, +% after=\leavevmode{\pkgcolor\hrule height3.4pt depth-3pt\relax}, % bookmark=bold,% % bookmark/text=Contents,% % } @@ -647,7 +672,10 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \clearpage \bookmarksetup{startatroot,depth=3} % \sectionformat\section{bookmark={color=pkgcolor,bold}} % +% ^^A\loggingall % \Section[LaTeX](Interface LaTeX)[Interface \LaTeX{}]{Interface \LaTeX{}} +% ^^A\tracingnone +% % % \begin{declcs}[\red]{changefont}\{\staractive\hskip-2cm\keytab{^^A % encoding\OR enc & changes \cs{fontencoding} \\ @@ -666,7 +694,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % If a key is not specified, the current value remains. % % {\small Finally, \cs{changefont} is compatible with \xpackage{hyperref} thank to \cs{pdfstringdefDisableCommands}.} -% +% % \begin{declcs}[\red]{rowfont}\M[alignment]\M{font specification} % \end{declcs} % @@ -1133,14 +1161,19 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % with their \textt[\opt]{\textellipsis bookmark} and \textt[\opt]{\textellipsis toc} counterparts. % % Assignation to those macros is automatic. More precisely, \cs{lastsectiontitle} is defined {\bfseries after \cs{sectionbreak}} -% and {\bfseries before \cs{sectionmark}}. {\smaller(For chapters, this is the same if \xpackage{titlesec} formats the chapter +% and {\bfseries before \cs{sectionmark}}: this means that in the fields \textt[\opt]{after} or \textt[\opt]{mark} of \csref{sectionformat}, +% \cs{lastsectiontitle} has been updated yet. While in the fields \textt[\opt]{before}, and \textt[\opt]{break}, \cs{lastsectiontitle} is +% not yet updated. {\smaller(For chapters, this is the same if \xpackage{titlesec} formats the chapter % titles, \ie if \cs{sectionformat}\cs{chapter} or \cs{titleformat}\cs{chapter} has been invoked. Otherwise, % \cs{lastchaptertitle}, \cs{lastchapterbookmark} and \cs{lastchaptertoc} are set at \cs{stepcounter}\M*{chapter}.)}. % -% Values are automatically reset to empty when a section of a superior level is created. +% Values are automatically reset to \csbf{relax} when a section of a superior level is created. % % This feature has been implemented essentially to make the use of a \cs{mark} command at \cs{sectionbreak} easier. -% I leave the reader to his thoughts about the necessity of such \cs{marks} in certain situations... +% Mark at \cs{sectionbreak} is important to get the correct behaviour for marks described in \thispackage[interface-marks] +% (page \pageref{marks} under \csref{ifmarksequal}). With this feature, when a new \cs{section} is created, +% \cs{lastsubsection} is reset to\, \csbf{relax}\, therefore,\, \cs{marksthecs}\M{subsection}\M{lastsubsection} +% will not mark anything. % % \ClearPage* % @@ -1298,7 +1331,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % % \cs[\red]{marksthecs}\M{subsubsection}\M{cs-name}\, will similarly mark the unexpanded content of \cs{cs-name} % by means of the marks register \cs{marks@\meta{subsubsection}}. \meta{cs-name} is really the -% \textitbf{name of the control sequence}, not the control sequence itself. +% \textitbf{name of the control sequence}, not the control sequence itself. If \cs{cs-name} is undefined or \cs{relax}, +% nothing is marked, making \cs{marksthecs} suitable to use with \cs{lastsectiontitle} \etc. at \cs{sectionbreak} +% (see \thispackage[interfaces-hypbmsec] p. \pageref{hypbmsec}). % % % \begin{declcs}[\red]{thefirstmarks}\M{named-mark} \\ @@ -1317,7 +1352,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \end{description} % % If there is no mark or if the mark register does not exist, expansion is null (\ie nothing is done). -% +% % {\small % Those commands can be used in headers and footers, f.ex: % \begin{Verb*} @@ -1349,16 +1384,16 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \cs[\red]{ifmarksequal} expands conditionnally code \M{true} only if the specified marks register to compare are equal, % otherwise \M{false}. % -% +% % {\small % \begin{tabular}{!{\textbullet}l@{\,=\,}l!{$\Leftrightarrow$}l} % \cs{firstmarks} &\cs{botmarks} &there is at most one section title on the current page; \\ % \cs{topmarks} &\cs{botmarks} &there is no section title on the current page;\\ % \cs{firstmarks} &\cs{topmarks} &the last section title continues on the current page. % \end{tabular} -% +% % Those assertions are true only if you mark the section title at \cs{sectionmark} and at \cs{sectionbreak}: this is easy when using -% \thispackage[interfaces-hypbmsec] and \cs{lastsectiontitle}... +% \thispackage[interfaces-hypbmsec]: \cs{sectionformat}\cs{subsection}\M*{break=\cs{marksthecs}\M*{subsection}\M*{lastsubsectiontoc}}. % % If the marks register\, \cs{marks@\meta{named-mark}}\, does not exist, the \M{false} part is expanded. % } \enlargethispage\baselineskip @@ -1643,7 +1678,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \ifdim#1pt<17pt denutrition\else \ifdim#1pt<19pt skinniness\else \ifdim#1pt<26pt normal\else % \ifdim#1pt<30pt obesity\else \ifdim#1pt<35pt serious obesity\else morbid obesity\fi\fi\fi\fi\fi}} % -% \iftrue ^^A set to true to compute. +% \iffalse%true ^^A set to true to compute. % \begin{tabular}{*{\countvalues\heightlist}{|c}|} \hline % \repeatcell\heightlist{% % rows=\weightlist, @@ -1832,6 +1867,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \trunctext{\htruncwidth{3}}{third} % \end{Verb*} % +% \ClearPage +% % \htruncadjust{3cm}{first quite long,second short,third} % \def\TruncateMarker{...} % {\color{Fuchsia}\qquad \smex \trunctext{\htruncwidth{1}}{first quite long}\trunctext{\htruncwidth{2}}{second short}\trunctext{\htruncwidth{3}}{third} @@ -1929,8 +1966,11 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \handler/.defcounter/ &the same, but stores into a \LaTeX{} counter \\ % \handler/.store as glue/, \handler/.estore as glue/ &store a glue in the key (\stform+\, \stform-\, and\, \stform* keys are provided to add, substract or scale) \\ % \handler/.store as glue in cs/, \handler/.estore as glue in cs/ &the same, store in a given named control sequence \\ +% \handler/.store in skip cs/ &store the glue inside a \cs{skip} register rather than in a macro \\ % \handler/.store as dimen/, \handler/.estore as dimen/ &store a dimen in the key (with \stform+\, \stform-\, and\, \stform* keys for addition, substraction and scaling) \\ -% \handler/.store as dimen in cs/, \handler/.estore as dimen in cs/ &the same, store in a given named control sequence rather than in the key itself \\ } +% \handler/.store as dimen in cs/, \handler/.estore as dimen in cs/ &the same, store in a given named control sequence rather than in the key itself \\ +% \handler/.store in dimen cs/ &store the dimension into a \cs{dimen} register rather than in a macro \\ +% } % % \smaller % \def\parsetest#1\\#3\END{\makecell[tl]{\repeatcell{#1}{text=\c,transpose}}\\ \ifblank{#3}{}{\hdashline[1.5pt/0.4pt] \parsetest #3\END}} @@ -2378,7 +2418,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % are local to the group, but govern only the very next bookmark. % % After the bookmark has been written, previous values must be restored at the end of each group until -% the same group level as the one in which the \stform* option has been set is reach (if this group is the main group, +% the same group level as the one in which the \stform* option has been set is reached (if this group is the main group, % level \textt0, then a global assignment is made). % % Well... this is done at \cs{write}: \cs{immediate}\cs{write}\M*{the bookmark entry} @@ -2434,11 +2474,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \item at the beginning of \cs{hbs@process} \qquad {\smaller\smex to store the next section title, bookmark and toc} % \end{itemize} % -% \PatchedCommand[hypbmsec]{ttl@select}{interfaces-hypbmsec,interfaces-titlesec}{1} -% -% The update of \cs{lastsectiontitle}, \cs{lastsectionbookmark} and \cs{lastsectiontoc} occurs at the beginning of \cs{ttl@select}. -% At that time, those macros receive the values for the current section that were stored at the beginning of \cs{hbs@process}. -% % \subsection[enumitem]{\xpackage{enumitem}} % % \PatchedCommand[enumitem]{setlist}{interfaces-enumitem}{0} @@ -2479,7 +2514,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %<*package> \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{interfaces} - [2010/10/20 v1.0 - pgfkeys macros for other packages (FC)] + [2010/10/27 v1.2 - pgfkeys macros for other packages (FC)] % \end{macrocode} % % \subsubsection{Requirements} @@ -2521,7 +2556,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*base> \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}% @@ -2654,7 +2689,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \cs{PackageInfo} is then deferred \cs{AtBeginDocument} time... % % \begin{macrocode} -\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 @@ -2662,6 +2697,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \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 @@ -2670,6 +2706,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> {#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 @@ -2766,11 +2803,11 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %% 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}% +}}% % \end{macrocode} % \end{macro} % @@ -2807,12 +2844,15 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % % \begin{macrocode} %% \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@ @@ -2821,6 +2861,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \@defaultunits#1 #2mu\relax\@nnil \fi }% \itf@units@mu +}} % \end{macrocode} % \end{macro} % @@ -2830,15 +2871,19 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % % \begin{macrocode} %% \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 % \end{macrocode} % \end{macro} % @@ -2904,7 +2949,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*LaTeX> \ProvidesPackage{interfaces-LaTeX} - [2010/10/10 v1.0 pgfkeys macros for LaTeX (FC)] + [2010/10/27 v1.2 pgfkeys macros for LaTeX (FC)] \RequirePackage{interfaces-base} \itf@pgfkeys % \end{macrocode} @@ -2954,6 +2999,14 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> linespread*/.prefix code=\ifx\f@linespread\@empty\let\f@linespread\@ne\fi,% spread/.alias*=linespread,% }% \pgfkeys definitions for \changefont +\itf@AfterPackage{color}{% + \pgfkeysifdefined{/itf/LaTeX/changefont/color/.@cmd}{} + {\pgfkeys{/itf/LaTeX/changefont/color/.code=\color{#1}}}% +}% AfterPackage color +\itf@AfterPackage{xcolor}{% + \pgfkeysifdefined{/itf/LaTeX/changefont/color/.@cmd}{} + {\pgfkeys{/itf/LaTeX/changefont/color/.code=\color{#1}}}% +}% AfterPackage xcolor % \end{macrocode} % % \subsubsection{\cs{rowfont}} @@ -3048,7 +3101,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % is the right one of a ``normal'' column. The switch \cs{ifitf@cellright} is set to \textt{true}. \\ % The \emph{previous} token (\cs{toks}$<i>=$\cs{toks}\cs{count@}) is necessarily the left one of this ``normal'' column: % we prepend \cs{itf@celllalign} and append \cs{itf@cellleft} to this token (\cs{toks}$<i>$). -% This token is finished and will not changed afterwards. +% This token is finished and will not change afterwards. % % \item[or: $\mathbf{i=}$\cs{count@}$\,=$\cs{@tempcnta}$+1$]: the token to prepare (\cs{toks}$<i+1>$) is either the left one of a normal column, % or the single one of a special\, \texttbf @ or \texttbf !\, column.\\ @@ -3262,7 +3315,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*tikz> \ProvidesPackage{interfaces-tikz} - [2010/09/21 v1.0 load of tikz libraries easily (FC)] + [2010/10/27 v1.2 load of tikz libraries easily (FC)] \RequirePackage{interfaces-base} \itf@pgfkeys % \end{macrocode} @@ -3414,7 +3467,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*titlesec> \ProvidesPackage{interfaces-titlesec} - [2010/10/20 v1.0 pgfkeys macros for titlesec (FC)] + [2010/10/27 v1.2 pgfkeys macros for titlesec (FC)] \RequirePackage{interfaces-base} \RequirePackage{auxhook}% for fix for \ttlp@append (odd/even pages, not implemented in interfaces) \itf@Check@Package{titlesec} @@ -3470,7 +3523,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> {\pgfqkeys{/itf/titlesec/#1#2} {/itf/titlesec/@setup={#1}{#2},#4,/itf/titlesec/@update={#1}{#2}}} {\pgfqkeys{/itf/titlesec/#1#2} - {/itf/titlesec/@setup={#1}{#2},shape={#3},#4,/itf/titlesec/@update={#1}{#2}}}% + {/itf/titlesec/@setup={#1}{#2},#4,shape={#3},/itf/titlesec/@update={#1}{#2}}}% }% \itf@ttl@sectionformat % \end{macrocode} % \end{macro} @@ -3628,7 +3681,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \def\itf@ttl@createsection#1{% sectionning command undefined: temporarily defined \expandafter\titleclass\csname#1\endcsname{straight}[*]% in straight class \itf@AfterPackage{hypbmsec}{% - \AtBeginDocument{% + \AfterPreamble{% \csletcs{hbs@#1}{#1}% \csxdef{#1}{\noexpand\hbs@do\expandafter\noexpand\csname hbs@#1\endcsname}% }% @@ -3637,9 +3690,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \itf@cft@newsection{#1}{toc}% }% \itf@AfterPackage{interfaces-hypbmsec}{% - \cslet{last#1title}\@empty - \cslet{last#1bookmark}\@empty - \cslet{last#1toc}\@empty + \expandafter\let\csname last#1title\endcsname\relax + \expandafter\let\csname last#1bookmark\endcsname\relax + \expandafter\let\csname last#1toc\endcsname\relax }% }% \itf@ttl@createsection % \end{macrocode} @@ -3676,7 +3729,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> }% \pgfqkeys{/itf/titlesec/#1#2}{% shape/.value required,% - shape@cs/.initial=\csname ttlh@\pgfkeysvalueof{/itf/titlesec/#1#2/shape}\endcsname,% constant + shape@cs/.initial= + \ifdefined\itf@last@from@next\itf@last@from@next{#1}\fi % interfaces-hypbmsec + \csname ttlh@\pgfkeysvalueof{/itf/titlesec/#1#2/shape}\endcsname,% constant shape@cs/.is private=interface-titlesec,% constant font/.store as code,% format/.alias*=font,% @@ -3765,9 +3820,11 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % % \begin{macro}{\addcontentsline (patch)} % \patchlabel[prepend]{addcontentsline} +% % \qquad This modification of \cs{addcontentsline} occurs only if both \thispackage[interfaces-bookmark] \textbf{and} % \thispackage[interfaces-titlesec] are loaded. Implementation of the \textt[\pkgcolor]{bookmark} key and sub-keys % of \cs{sectionformat} for each sectionning command. +% % \begin{macrocode} %% bookmarks styles for sectionning commands: \@makeother\# @@ -3841,7 +3898,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*hyperref> \ProvidesPackage{interfaces-hyperref} - [2010/08/08 v1.0 provides raised hyperdef (FC)] + [2010/10/27 v1.2 provides raised hyperdef (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{hyperref} % \end{macrocode} @@ -3881,7 +3938,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*bookmark> \ProvidesPackage{interfaces-bookmark} - [2010/09/08 v1.0 more control on bookmarks (FC)] + [2010/10/27 v1.2 more control on bookmarks (FC)] \RequirePackage{interfaces-base} \RequirePackage{interfaces-hyperref} \RequirePackage{refcount} @@ -4095,7 +4152,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*hypbmsec> \ProvidesPackage{interfaces-hypbmsec} - [2010/10/05 v1.0 lastsection etc. (FC)] + [2010/10/27 v1.2 lastsection etc. (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{hypbmsec} \AfterPackage*{interfaces-titlesec}{% requires interface-titlesec @@ -4108,8 +4165,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % % \begin{macrocode} %<*hypbmsec.code.tex> -\ProvidesFile{hypbmsec.code.tex} - [2010/10/05 v1.0 code for interfaces-hypbmsec (FC)] +\ProvidesFile{interfaces-hypbmsec.code.tex} + [2010/10/27 v1.2 code for interfaces-hypbmsec (FC)] % \end{macrocode} % % \begin{macro}{\hbs@do (patch)} @@ -4124,7 +4181,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> {Command \string\hbs@do\space could not be patched \MessageBreak loading of `interfaces-hypbmsec` aborted \MessageBreak \string\lastsection\space will not work}% - \endinput}% + \endinput} % \end{macrocode} % \end{macro} % @@ -4148,102 +4205,70 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} \long\def\itf@hbs@next#1{% \csdef{itf@next\itf@tp title}{#1}% - \ifx\hbs@tocstring\relax - \csletcs{itf@next\itf@tp toc}{itf@next\itf@tp}% - \else - \cslet{itf@next\itf@tp toc}\hbs@tocstring - \fi - \ifx\hbs@bmstring\relax - \csletcs{itf@next\itf@tp bookmark}{itf@next\itf@tp toc}% - \else - \cslet{itf@next\itf@tp bookmark}\hbs@bmstring - \fi + \expandafter\let\csname itf@next\itf@tp toc\expandafter\endcsname + \csname + \ifx\hbs@tocstring\relax itf@next\itf@tp title\else + hbs@tocstring\fi + \endcsname + \expandafter\let\csname itf@next\itf@tp bookmark\expandafter\endcsname + \csname + \ifx\hbs@bmstring\relax itf@next\itf@tp toc\else + hbs@bmstring\fi + \endcsname \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter \expandafter\itf@hbs@chkclass \expandafter\expandafter\expandafter\string \expandafter\hbs@seccmd\string\ttl@\@nil - {} {\expandafter\itf@last@from@next\expandafter{\itf@tp}}% }% \itf@hbs@next -\edef\itf@tp{% - \long\def\noexpand\itf@hbs@chkclass##1\string\ttl@##2\noexpand\@nil{% - \noexpand\ifblank{##1}% - }% \itf@hbs@chkclass -}\itf@tp -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\ttl@select (patch)} -% \patchlabel[prepend]{ttl@select} -% \begin{macrocode} -\itf@patch\pretocmd\ttl@select{% - \itf@last@from@next{#1}} - {\PackageInfo{interfaces-hypbmsec} - {Command \string\ttl@select\space successfully patched}} - {\PackageWarning{interfaces-hypbmsec} - {Command \string\ttl@select\space could not be patched - \MessageBreak loading of `interfaces-hypbmsec` aborted - \MessageBreak \string\lastsection\space will not work}% - \endinput}% +\long\expandafter\def\expandafter\itf@hbs@chkclass + \expandafter#\expandafter1\string\ttl@#2\@nil{% + \ifblank{#1}{\if@nobreak\itf@hbs@nobreakfix#2\@nnil\fi}% +}% \itf@hbs@chkclass +\def\itf@hbs@nobreakfix#1#{\itf@hbs@n@breakfix} +\def\itf@hbs@n@breakfix#1#2\@nnil{% + \unless\ifx\lastsectionname\relax + \unless\ifnum\csname ttll@#1\endcsname > \csname ttll@\lastsectionname\endcsname\relax + \@nobreakfalse + \fi\fi +}% \itf@hbs@nobreakfix % \end{macrocode} % \end{macro} % % \begin{macro}{\itf@last@from@next} % \begin{macrocode} \def\itf@last@from@next#1{% - \expandafter\let\csname last#1title\expandafter\endcsname + \gdef\lastsectionname{#1}% + \global\expandafter\let\csname last#1title\expandafter\endcsname \csname itf@next#1title\endcsname - \expandafter\let\csname itf@last#1toc\expandafter\endcsname + \global\expandafter\let\csname last#1toc\expandafter\endcsname \csname itf@next#1toc\endcsname - \expandafter\let\csname last#1bookmark\expandafter\endcsname + \global\expandafter\let\csname last#1bookmark\expandafter\endcsname \csname itf@next#1bookmark\endcsname - \expandafter\def\csname lastsectionname\endcsname{#1}% + \let\@elt\itf@resetlastsections + \csname cl@#1\endcsname }% \itf@last@from@next +\def\itf@resetlastsections#1{% + \expandafter\let\csname last#1title\endcsname\relax + \expandafter\let\csname last#1toc\endcsname\relax + \expandafter\let\csname last#1bookmark\endcsname\relax + \csname cl@#1\endcsname +}% \itf@resetlastsections % \end{macrocode} % \end{macro} % % \begin{macrocode} -%%----------------------------------------------------------------------------- -%% \lastsection reinitialization (at \stepcounter-> \cl@section) -\def\itf@hbs@resetlast#1{% - \ifcsname last#1\endcsname - \global\expandafter\let - \csname last#1\endcsname\@empty - \fi -}% \itf@hbs@resetlast -\def\itf@hbs@reset#1{% - \itf@hbs@resetlast{#1title}% - \itf@hbs@resetlast{#1bookmark}% - \itf@hbs@resetlast{#1toc}% - \csuse{cl@#1}% -}% \itf@hbs@reset -% \end{macrocode} -% -% \begin{macrocode} -\let\ltx@stpelt\@stpelt -\def\itf@hbs@stpelt#1{% - \let\@elt\itf@hbs@reset - \@elt{#1}% - \let\@elt\itf@stpelt -}% \itf@hbs@stpelt -\def\itf@stpelt#1{% - \ltx@stpelt{#1}% - \itf@hbs@stpelt{#1}% -}% \itf@stpelt -\let\@stpelt\itf@stpelt -%%----------------------------------------------------------------------------- -% \end{macrocode} -% -% \begin{macrocode} +\let\lastsectionname\relax \@for\itf@tp:=part,section,subsection,subsubsection,paragraph,subparagraph% - \do{\global\expandafter\let\csname last\itf@tp title\endcsname\@empty - \global\expandafter\let\csname last\itf@tp toc\endcsname\@empty - \global\expandafter\let\csname last\itf@tp bookmark\endcsname\@empty}% + \do{\expandafter\let\csname last\itf@tp title\endcsname\relax + \expandafter\let\csname last\itf@tp toc\endcsname\relax + \expandafter\let\csname last\itf@tp bookmark\endcsname\relax + }% \AtBeginDocument{\ifundef\chapter{} - {\global\let\lastchaptertitle\@empty - \global\let\lastchaptertoc\@empty - \global\let\lastchapterbookmark\@empty}% + {\let\lastchaptertitle\relax + \let\lastchaptertoc\relax + \let\lastchapterbookmark\relax}% }% % \end{macrocode} % @@ -4256,7 +4281,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*fancyhdr> \ProvidesPackage{interfaces-fancyhdr} - [2010/07/22 v1.0 pgfkeys macros for fancyhdr (FC)] + [2010/10/27 v1.2 pgfkeys macros for fancyhdr (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{fancyhdr} \itf@pgfkeys @@ -4383,149 +4408,210 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> rule/font/.style={head/rule/font={#1},foot/rule/font={#1}},% rule/font+/.style={head/rule/font+={#1},foot/rule/font+={#1}},% rule/font*/.alias=rule/font+,% + rules/font/.alias=rule/font, + rules/font+/.alias=rule/font+,% + rules/font*/.alias=rule/font+,% rule/color/.style={head/rule/color={#1},foot/rule/color={#1}},% + rules/color/.alias=rule/color,% foot/rule/skip/.store as glue in cs=footruleskip,% foot/rule/skip/.default=.3\normalbaselineskip,% foot/rule/skip/.blank=\z@,% foot/ruleskip/.alias*=foot/rule/skip,% => puis les alias&style: /.alias 2 args=/foot/rule/skip{/subkey1,/subkey2,/sub/key3,/sub/key4,...} footruleskip/.alias*=foot/rule/skip,% crée aussi les alias pour les sous clés font/.style={head/font={#1},foot/font={#1}},% + font+/.style={head/font+={#1},foot/font+={#1}},% + font*/.alias=font+,% head/.style={head/left={#1},head/center={#1},head/right={#1}},% head/font/.style={head/left/font={#1},head/center/font={#1},head/right/font={#1}},% head/font+/.style={head/left/font+={#1},head/center/font+={#1},head/right/font+={#1}},% + head/font*/.alias=head/font+,% nohead/.style={head=,head/font=,head/rule=}, foot/.style={foot/left={#1},foot/center={#1},foot/right={#1}},% foot/font/.style={foot/left/font={#1},foot/center/font={#1},foot/right/font={#1}},% foot/font+/.style={foot/left/font+={#1},foot/center/font+={#1},foot/right/font+={#1}},% + foot/font*/.alias=foot/font+,% nofoot/.style={foot=,foot/font=,foot/rule=}, left/.style={head/left={#1},foot/left={#1}},% left/font/.style={head/left/font={#1},foot/left/font={#1}},% left/font+/.style={head/left/font+={#1},foot/left/font+={#1}},% + left/font*/.alias=left/font+,% center/.style={head/center={#1},foot/center={#1}},% center/font/.style={head/center/font={#1},foot/center/font={#1}},% center/font+/.style={head/center/font+={#1},foot/center/font+={#1}},% + center/font*/.alias=center/font+,% right/.style={head/right={#1},foot/right={#1}},% right/font/.style={head/right/font={#1},foot/right/font={#1}},% right/font+/.style={head/right/font+={#1},foot/right/font+={#1}},% + right/font*/.alias=right/font+,% head/left/.style={head/left/even={#1},head/left/odd={#1}},% head/left/font/.style={head/left/even/font={#1},head/left/odd/font={#1}},% head/left/font+/.style={head/left/even/font+={#1},head/left/odd/font+={#1}},% + head/left/font*/.alias=head/left/font+,% head/center/.style={head/center/even={#1},head/center/odd={#1}},% head/center/font/.style={head/center/even/font={#1},head/center/odd/font={#1}},% head/center/font+/.style={head/center/even/font+={#1},head/center/odd/font+={#1}},% + head/center/font*/.alias=head/center/font+,% head/right/.style={head/right/even={#1},head/right/odd={#1}},% head/right/font/.style={head/right/even/font={#1},head/right/odd/font={#1}},% head/right/font+/.style={head/right/even/font+={#1},head/right/odd/font+={#1}},% + head/right/font*/.alias=head/right/font+,% foot/left/.style={foot/left/even={#1},foot/left/odd={#1}},% foot/left/font/.style={foot/left/even/font={#1},foot/left/odd/font={#1}},% foot/left/font+/.style={foot/left/even/font+={#1},foot/left/odd/font+={#1}},% + foot/left/font*/.alias=foot/left/font+,% foot/center/.style={foot/center/even={#1},foot/center/odd={#1}},% foot/center/font/.style={foot/center/even/font={#1},foot/center/odd/font={#1}},% foot/center/font+/.style={foot/center/even/font+={#1},foot/center/odd/font+={#1}},% + foot/center/font*/.alias=foot/center/font+,% foot/right/.style={foot/right/even={#1},foot/right/odd={#1}},% foot/right/font/.style={foot/right/even/font={#1},foot/right/odd/font={#1}},% foot/right/font+/.style={foot/right/even/font+={#1},foot/right/odd/font+={#1}},% + foot/right/font*/.alias=foot/right/font+,% head/left/odd/.fancy@hf=olh,% - head/left/odd/font/.store as code=+,% + head/left/odd/font/.store as code,% odd/head/left/.alias=head/left/odd,% odd/head/left/font/.alias*=head/left/odd/font,% head/odd/left/.alias=head/left/odd,% head/odd/left/font/.alias*=head/left/odd/font,% head/center/odd/.fancy@hf=och,% - head/center/odd/font/.store as code=+,% + head/center/odd/font/.store as code,% odd/head/center/.alias=head/center/odd,% odd/head/center/font/.alias*=head/center/odd/font,% head/odd/center/.alias=head/center/odd,% head/odd/center/font/.alias*=head/center/odd/font,% head/right/odd/.fancy@hf=orh,% - head/right/odd/font/.store as code=+,% + head/right/odd/font/.store as code,% odd/head/right/.alias=head/right/odd,% odd/head/right/font/.alias*=head/right/odd/font,% head/odd/right/.alias=head/right/odd,% head/odd/right/font/.alias*=head/right/odd/font,% head/left/even/.fancy@hf=elh,% - head/left/even/font/.store as code=+,% + head/left/even/font/.store as code,% even/head/left/.alias=head/left/even,% even/head/left/font/.alias*=head/left/even/font,% head/even/left/.alias=head/left/even,% head/even/left/font/.alias*=head/left/even/font,% head/center/even/.fancy@hf=ech,% - head/center/even/font/.store as code=+,% + head/center/even/font/.store as code,% even/head/center/.alias=head/center/even,% even/head/center/font/.alias*=head/center/even/font,% head/even/center/.alias=head/center/even,% head/even/center/font/.alias*=head/center/even/font,% head/right/even/.fancy@hf=erh,% - head/right/even/font/.store as code=+,% + head/right/even/font/.store as code,% even/head/right/.alias=head/right/even,% even/head/right/font/.alias*=head/right/even/font,% head/even/right/.alias=head/right/even,% even/head/right/font/.alias*=head/right/even/font,% foot/left/odd/.fancy@hf=olf,% - foot/left/odd/font/.store as code=+,% + foot/left/odd/font/.store as code,% odd/foot/left/.alias=foot/left/odd,% odd/foot/left/font/.alias*=foot/left/odd/font,% foot/odd/left/.alias=foot/left/odd,% foot/odd/left/font/.alias*=foot/left/odd/font,% foot/center/odd/.fancy@hf=ocf,% - foot/center/odd/font/.store as code=+,% + foot/center/odd/font/.store as code,% odd/foot/center/.alias=foot/center/odd,% odd/foot/center/font/.alias*=foot/center/odd/font,% foot/odd/center/.alias=foot/center/odd,% foot/odd/center/font/.alias*=foot/center/odd/font,% foot/right/odd/.fancy@hf=orf,% - foot/right/odd/font/.store as code=+,% + foot/right/odd/font/.store as code,% odd/foot/right/.alias=foot/right/odd,% odd/foot/right/font/.alias*=foot/right/odd/font,% odd/foot/right/.alias=foot/right/odd,% odd/foot/right/font/.alias*=foot/right/odd/font,% foot/left/even/.fancy@hf=elf,% - foot/left/even/font/.store as code=+,% + foot/left/even/font/.store as code,% even/foot/left/.alias=foot/left/even,% even/foot/left/font/.alias*=foot/left/even/font,% foot/even/left/.alias=foot/left/even,% foot/even/left/font/.alias*=foot/left/even/font,% foot/center/even/.fancy@hf=ecf,% - foot/center/even/font/.store as code=+,% + foot/center/even/font/.store as code,% even/foot/center/.alias=foot/center/even,% even/foot/center/font/.alias*=foot/center/even/font,% foot/even/center/.alias=foot/center/even,% foot/even/center/font/.alias*=foot/center/even/font,% foot/right/even/.fancy@hf=erf,% - foot/right/even/font/.store as code=+,% + foot/right/even/font/.store as code,% even/foot/right/.alias=foot/right/even,% even/foot/right/font/.alias*=foot/right/even/font,% foot/even/right/.alias=foot/right/even,% foot/even/right/font/.alias*=foot/right/even/font,% offset/.style={head/offset={#1},foot/offset={#1}},% + offset+/.style={head/offset+={#1},foot/offset+={#1}},% + offset-/.style={head/offset-={#1},foot/offset-={#1}},% + offset*/.style={head/offset*={#1},foot/offset*={#1}},% head/offset/.style={head/left/offset={#1},head/right/offset={#1}},% - offset/head/.alias=head/offset,% + head/offset+/.style={head/left/offset+={#1},head/right/offset+={#1}},% + head/offset-/.style={head/left/offset-={#1},head/right/offset-={#1}},% + head/offset*/.style={head/left/offset*={#1},head/right/offset*={#1}},% + offset/head/.alias*=head/offset,% foot/offset/.style={foot/left/offset={#1},foot/right/offset={#1}},% - offset/foot/.alias=foot/offset,% - head/left/offset/.style={head/left/even/offset={#1},head/left/odd/offset={#1}},% - offset/head/left/.alias=head/left/offset,% - head/right/offset/.style={head/right/even/offset={#1},head/right/odd/offset={#1}},% - offset/head/right/.alias=head/right/offset,% + foot/offset+/.style={foot/left/offset+={#1},foot/right/offset+={#1}},% + foot/offset-/.style={foot/left/offset-={#1},foot/right/offset-={#1}},% + foot/offset*/.style={foot/left/offset*={#1},foot/right/offset*={#1}},% + offset/foot/.alias*=foot/offset,% + left/offset/.style={foot/left/offset={#1},head/left/offset={#1}},% + left/offset+/.style={foot/left/offset+={#1},head/left/offset+={#1}},% + left/offset-/.style={foot/left/offset-={#1},head/left/offset-={#1}},% + left/offset*/.style={foot/left/offset*={#1},head/left/offset*={#1}},% + offset/left/.alias*=left/offset,% + right/offset/.style={foot/right/offset={#1},head/right/offset={#1}},% + right/offset+/.style={foot/right/offset+={#1},head/right/offset+={#1}},% + right/offset-/.style={foot/right/offset-={#1},head/right/offset-={#1}},% + right/offset*/.style={foot/right/offset*={#1},head/right/offset*={#1}},% + offset/right/.alias*=right/offset,% + head/left/offset/.style={head/left/even/offset={#1},head/left/odd/offset={#1}},% + head/left/offset+/.style={head/left/even/offset+={#1},head/left/odd/offset+={#1}},% + head/left/offset-/.style={head/left/even/offset-={#1},head/left/odd/offset-={#1}},% + head/left/offset*/.style={head/left/even/offset*={#1},head/left/odd/offset*={#1}},% + offset/head/left/.alias*=head/left/offset,% + offset/left/head/.alias*=head/left/offset,% + head/right/offset/.style={head/right/even/offset={#1},head/right/odd/offset={#1}},% + head/right/offset+/.style={head/right/even/offset+={#1},head/right/odd/offset+={#1}},% + head/right/offset-/.style={head/right/even/offset-={#1},head/right/odd/offset-={#1}},% + head/right/offset*/.style={head/right/even/offset*={#1},head/right/odd/offset*={#1}},% + offset/head/right/.alias*=head/right/offset,% + offset/right/head/.alias*=head/right/offset,% foot/left/offset/.style={foot/left/even/offset={#1},foot/left/odd/offset={#1}},% - offset/foot/left/.alias=foot/left/offset,% + foot/left/offset+/.style={foot/left/even/offset+={#1},foot/left/odd/offset+={#1}},% + foot/left/offset-/.style={foot/left/even/offset-={#1},foot/left/odd/offset-={#1}},% + foot/left/offset*/.style={foot/left/even/offset*={#1},foot/left/odd/offset*={#1}},% + offset/foot/left/.alias*=foot/left/offset,% + offset/left/foot/.alias*=foot/left/offset,% foot/right/offset/.style={foot/right/even/offset={#1},foot/right/odd/offset={#1}},% - offset/foot/right/.alias=foot/right/offset,% - head/left/even/offset/.store in skip cs=f@ncyO@elh,% - offset/head/left/even/.alias=head/left/even/offset,% - head/left/odd/offset/.store in skip cs=f@ncyO@olh,% - offset/head/left/odd/.alias=head/left/odd/offset,% - head/right/even/offset/.store in skip cs=f@ncyO@erh,% - offset/head/right/even/.alias=head/right/even/offset,% - head/right/odd/offset/.store in skip cs=f@ncyO@orh,% - offset/head/right/odd/.alias=head/right/odd/offset,% + foot/right/offset+/.style={foot/right/even/offset+={#1},foot/right/odd/offset+={#1}},% + foot/right/offset-/.style={foot/right/even/offset-={#1},foot/right/odd/offset-={#1}},% + foot/right/offset*/.style={foot/right/even/offset*={#1},foot/right/odd/offset*={#1}},% + offset/foot/right/.alias*=foot/right/offset,% + offset/right/foot/.alias*=foot/right/offset,% + head/left/even/offset/.store in skip cs=f@ncyO@elh,% + head/left/even/offset/.append code=\fancy@setoffs,% + offset/head/left/even/.alias*=head/left/even/offset,% + head/left/odd/offset/.store in skip cs=f@ncyO@olh,% + head/left/odd/offset/.append code=\fancy@setoffs,% + offset/head/left/odd/.alias*=head/left/odd/offset,% + offset/head/left/odd/.alias*=head/left/odd/offset,% + head/right/even/offset/.store in skip cs=f@ncyO@erh,% + head/right/even/offset/.append code=\fancy@setoffs,% + offset/head/right/even/.alias*=head/right/even/offset,% + head/right/odd/offset/.store in skip cs=f@ncyO@orh,% + head/right/odd/offset/.append code=\fancy@setoffs,% + offset/head/right/odd/.alias*=head/right/odd/offset,% foot/left/even/offset/.store in skip cs=f@ncyO@elf,% - offset/foot/left/even/.alias=foot/left/even/offset,% + foot/left/even/offset/.append code=\fancy@setoffs,% + offset/foot/left/even/.alias*=foot/left/even/offset,% foot/left/odd/offset/.store in skip cs=f@ncyO@olf,% - offset/foot/left/odd/.alias=foot/left/odd/offset,% - foot/right/even/offset/.store in skip cs=f@ncyO@erf,% - offset/foot/right/even/.alias=foot/right/even/offset,% - foot/right/odd/offset/.store in skip cs=f@ncyO@orf,% - offset/foot/right/odd/.alias=foot/right/odd/offset,% + foot/left/odd/offset/.append code=\fancy@setoffs,% + offset/foot/left/odd/.alias*=foot/left/odd/offset,% + foot/right/even/offset/.store in skip cs=f@ncyO@erf,% + foot/right/even/offset/.append code=\fancy@setoffs,% + offset/foot/right/even/.alias*=foot/right/even/offset,% + foot/right/odd/offset/.store in skip cs=f@ncyO@orf,% + foot/right/odd/offset/.append code=\fancy@setoffs,% + offset/foot/right/odd/.alias*=foot/right/odd/offset,% reset/.style={norule,head=,foot=,offset=\z@,foot/rule/skip,rule/font=,font=},% reset/.value forbidden,% }% keys for \pagesetup (stored into token \itf@tk) @@ -4549,7 +4635,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*marks> \ProvidesPackage{interfaces-marks} - [2010/10/12 v1.0 easier use of e-TeX marks (FC)] + [2010/10/27 v1.2 easier use of e-TeX marks (FC)] \RequirePackage{interfaces-base} % \end{macrocode} % @@ -4570,9 +4656,11 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \ifcsname marks@#1\endcsname\else \itf@marks@new{#1}% \fi - \expandafter\marks\csname marks@#1\endcsname{% - \unexpanded\expandafter\expandafter\expandafter{% - \csname#2\endcsname}}% + \ifcsundef{#2} + {} + {\expandafter\marks\csname marks@#1\endcsname{% + \unexpanded\expandafter\expandafter\expandafter{% + \csname#2\endcsname}}}% }% \marksthecs % \end{macrocode} % \end{macro} @@ -4665,7 +4753,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*tocloft> \ProvidesPackage{interfaces-tocloft} - [2010/07/23 v1.0 pgfkeys macros for tocloft (FC)] + [2010/10/27 v1.2 pgfkeys macros for tocloft (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{tocloft} \itf@pgfkeys @@ -4771,6 +4859,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> columns/rule/.default=\columnseprule,% columns/rule,% assign default columnseprule/.alias*=columns/rule,% + columns/rule/width/.alias*=columns/rule,% columns/sep/.store as dimen,% columns/sep/.default=\columnsep,% columns/sep/.blank=10\p@,% @@ -5022,7 +5111,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> {\PackageWarning{interfaces-tocloft} {Command \string\@cftmakelottitle\space could not be patched \MessageBreak label and bookmark keys for \string\lotsetup\space won't work}}% -\@makeother\# \itf@patch\apptocmd\newlistentry {\itf@cft@newlistof{#2}} {\PackageInfo{interfaces-tocloft} @@ -5030,7 +5118,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> {\PackageWarning{interfaces-tocloft} {Command \string\newlistentry\space could not be patched \MessageBreak \string\listofsetup\space will not work}}% -\catcode`\#=6 % \end{macrocode} % \end{macro} % \end{macro} @@ -5088,7 +5175,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*makecell> \ProvidesPackage{interfaces-makecell} - [2010/10/12 v1.0 more control on tabular cells (FC)] + [2010/10/27 v1.2 more control on tabular cells (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{makecell} \edef\itf@AtEnd{\catcode126 \the\catcode126}% 126 = ~ @@ -5488,7 +5575,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*enumitem> \ProvidesPackage{interfaces-enumitem} - [2010/10/12 v1.0 more control on lists (FC)] + [2010/10/27 v1.2 more control on lists (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{enumitem} \itf@pgfkeys @@ -5634,7 +5721,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \expandafter{\itf@trunc@width}% %% total=\the\dimexpr#1\relax }% \itf@htruncadjust -\def\itf@scalefactor#1#2{\strip@pt\dimexpr#1*65536/\number#2\relax} +\def\itf@scalefactor#1#2{\strip@pt\dimexpr#1*65536/#2\relax} \def\itf@scaledimen#1*#2/#3\relax{% \dimexpr\itf@scalefactor{#2}{#3}\dimexpr#1\relax\relax }% \itf@scaledimen @@ -5674,7 +5761,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*fancyvrb> \ProvidesPackage{interfaces-fancyvrb} - [2010/08/22 v1.0 Custom verbatim environments (FC)] + [2010/10/27 v1.2 Custom verbatim environments (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{fancyvrb} \itf@pgfkeys @@ -5713,7 +5800,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*appendix> \ProvidesPackage{interfaces-appendix} - [2010/10/20 v1.0 easy control of appendices environment (FC)] + [2010/10/27 v1.2 easy control of appendices environment (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{appendix} \itf@pgfkeys @@ -5768,7 +5855,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*embedfile> \ProvidesPackage{interfaces-embedfile} - [2010/06/20 v1.0 easy macros to embed files into pdf (FC)] + [2010/10/27 v1.2 easy macros to embed files into pdf (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{embedfile} \newrobustcmd*\embedthisfile{\@ifstar @@ -5781,7 +5868,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \embedthisfile@main \AfterPreamble{% \ltx@ifundefined{@listfiles} - {\let\@listfiles\@empty}% to avoid: \global\let\@fileslist\relax in \document + {\let\@listfiles\@empty}% to avoid: \global\let\@filelist\relax in \document {}% }% \gpreto\@enddocumenthook{% @@ -5842,7 +5929,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*scrlfile> \ProvidesPackage{interfaces-scrlfile} - [2010/08/09 v1.0 scrlfile hooks improved (FC)] + [2010/10/27 v1.2 scrlfile hooks improved (FC)] \RequirePackage{interfaces-base} % \end{macrocode} % @@ -5933,7 +6020,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*pgfkeys> \ProvidesPackage{interfaces-pgfkeys} - [2010/10/22 v1.1 pgfkeys handlers definitions (FC)] + [2010/10/27 v1.2 pgfkeys handlers definitions (FC)] \RequirePackage{interfaces-base} \AtEndOfPackage{% \let\itf@pgfkeys@unpack\pgfkeys@unpack @@ -6722,7 +6809,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \begin{macrocode} %<*etoolbox> \ProvidesPackage{interfaces-etoolbox} - [2010/06/10 some more etoolbox-like commands (FC)] + [2010/10/27 v1.2 some more etoolbox-like commands (FC)] \RequirePackage{interfaces-base} \begingroup\catcode`\&=3 \long\gdef\etb@doitem#1&{\do{#1}} @@ -6849,7 +6936,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \def\in@@@##1\in@@@##2\in@@@{% \ifx\in@##1\fi }\expandafter\in@@@\in@@#1\itf@tp\in@@@#2\in@@ -}% \itf@remove@fromstart +}% \itf@removefromstart % \end{macrocode} % \end{macro} %---------------------------------------------------------------------------- @@ -6859,12 +6946,15 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % % % \begin{History} -% -% \begin{Version}{2010/10/20 v1.0} -% \item First version. +% +% \begin{Version}{2010/10/27 v1.2} +% \item \thispackage[interfaces-hypbmsec] needed some corrections. +% \item The \textt{offset} keys for fancyhdr didn't work. Fixed. +% \item Correction of convertion \textt{pt} to \textt{mu} (catcodes...) +% \item Added \xpackage{microtype} to the documentation... % \end{Version} % -% +% % \begin{Version}{2010/10/20 v1.0} % \item First version. % \end{Version} diff --git a/Master/texmf-dist/source/latex/interfaces/interfaces.ins b/Master/texmf-dist/source/latex/interfaces/interfaces.ins index b6465c1eb4e..9c4e7dc681b 100644 --- a/Master/texmf-dist/source/latex/interfaces/interfaces.ins +++ b/Master/texmf-dist/source/latex/interfaces/interfaces.ins @@ -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 @@ -47,7 +47,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: 2010/10/20 v1.0 - interfaces: interfaces with keys for other packages (FC)} +\Msg{* Package: 2010/10/27 v1.2 - interfaces: interfaces with keys for other packages (FC)} \Msg{************************************************************************} \keepsilent @@ -58,7 +58,7 @@ This is a generated file. -interfaces : 2010/10/20 v1.0 - interfaces : interfaces with keys for other packages (FC) +interfaces : 2010/10/27 v1.2 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty index 9c1fb9afbc8..d5a4bcc072f 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.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-LaTeX} - [2010/10/10 v1.0 pgfkeys macros for LaTeX (FC)] + [2010/10/27 v1.2 pgfkeys macros for LaTeX (FC)] \RequirePackage{interfaces-base} \itf@pgfkeys \newrobustcmd*\changefont[1]{\itf@pgfkeys @@ -77,6 +77,14 @@ linespread*/.prefix code=\ifx\f@linespread\@empty\let\f@linespread\@ne\fi,% spread/.alias*=linespread,% }% \pgfkeys definitions for \changefont +\itf@AfterPackage{color}{% + \pgfkeysifdefined{/itf/LaTeX/changefont/color/.@cmd}{} + {\pgfkeys{/itf/LaTeX/changefont/color/.code=\color{#1}}}% +}% AfterPackage color +\itf@AfterPackage{xcolor}{% + \pgfkeysifdefined{/itf/LaTeX/changefont/color/.@cmd}{} + {\pgfkeys{/itf/LaTeX/changefont/color/.code=\color{#1}}}% +}% AfterPackage xcolor \newtoks\itf@everycr@tok % better than colortbl turnaround for \everycr \newcommand*\rowfont{\noalign{\ifnum0=`}\fi\itf@rowfont} \newrobustcmd*\itf@rowfont[2][]{% diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty index 41630693aa1..14b9ae13929 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.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-appendix} - [2010/10/20 v1.0 easy control of appendices environment (FC)] + [2010/10/27 v1.2 easy control of appendices environment (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{appendix} \itf@pgfkeys 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} diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty index 1fbbe49e829..4b2b05d5779 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.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-bookmark} - [2010/09/08 v1.0 more control on bookmarks (FC)] + [2010/10/27 v1.2 more control on bookmarks (FC)] \RequirePackage{interfaces-base} \RequirePackage{interfaces-hyperref} \RequirePackage{refcount} diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty index d0cb1b4fd57..93aefe12516 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.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-embedfile} - [2010/06/20 v1.0 easy macros to embed files into pdf (FC)] + [2010/10/27 v1.2 easy macros to embed files into pdf (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{embedfile} \newrobustcmd*\embedthisfile{\@ifstar @@ -58,7 +58,7 @@ \embedthisfile@main \AfterPreamble{% \ltx@ifundefined{@listfiles} - {\let\@listfiles\@empty}% to avoid: \global\let\@fileslist\relax in \document + {\let\@listfiles\@empty}% to avoid: \global\let\@filelist\relax in \document {}% }% \gpreto\@enddocumenthook{% diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty index 8798071958d..3ca0e663794 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.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-enumitem} - [2010/10/12 v1.0 more control on lists (FC)] + [2010/10/27 v1.2 more control on lists (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{enumitem} \itf@pgfkeys diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty index 8eb9e632eb6..422fe40a39a 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty index d2dd0a3e3e1..ee6e38dbf1d 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.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-etoolbox} - [2010/06/10 some more etoolbox-like commands (FC)] + [2010/10/27 v1.2 some more etoolbox-like commands (FC)] \RequirePackage{interfaces-base} \begingroup\catcode`\&=3 \long\gdef\etb@doitem#1&{\do{#1}} @@ -120,7 +120,7 @@ \def\in@@@##1\in@@@##2\in@@@{% \ifx\in@##1\fi }\expandafter\in@@@\in@@#1\itf@tp\in@@@#2\in@@ -}% \itf@remove@fromstart +}% \itf@removefromstart \endinput %% %% End of file `interfaces-etoolbox.sty'. diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty index 081b65e52a2..b1c15e77e8f 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.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-fancyhdr} - [2010/07/22 v1.0 pgfkeys macros for fancyhdr (FC)] + [2010/10/27 v1.2 pgfkeys macros for fancyhdr (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{fancyhdr} \itf@pgfkeys @@ -150,149 +150,210 @@ rule/font/.style={head/rule/font={#1},foot/rule/font={#1}},% rule/font+/.style={head/rule/font+={#1},foot/rule/font+={#1}},% rule/font*/.alias=rule/font+,% + rules/font/.alias=rule/font, + rules/font+/.alias=rule/font+,% + rules/font*/.alias=rule/font+,% rule/color/.style={head/rule/color={#1},foot/rule/color={#1}},% + rules/color/.alias=rule/color,% foot/rule/skip/.store as glue in cs=footruleskip,% foot/rule/skip/.default=.3\normalbaselineskip,% foot/rule/skip/.blank=\z@,% foot/ruleskip/.alias*=foot/rule/skip,% => puis les alias&style: /.alias 2 args=/foot/rule/skip{/subkey1,/subkey2,/sub/key3,/sub/key4,...} footruleskip/.alias*=foot/rule/skip,% crée aussi les alias pour les sous clés font/.style={head/font={#1},foot/font={#1}},% + font+/.style={head/font+={#1},foot/font+={#1}},% + font*/.alias=font+,% head/.style={head/left={#1},head/center={#1},head/right={#1}},% head/font/.style={head/left/font={#1},head/center/font={#1},head/right/font={#1}},% head/font+/.style={head/left/font+={#1},head/center/font+={#1},head/right/font+={#1}},% + head/font*/.alias=head/font+,% nohead/.style={head=,head/font=,head/rule=}, foot/.style={foot/left={#1},foot/center={#1},foot/right={#1}},% foot/font/.style={foot/left/font={#1},foot/center/font={#1},foot/right/font={#1}},% foot/font+/.style={foot/left/font+={#1},foot/center/font+={#1},foot/right/font+={#1}},% + foot/font*/.alias=foot/font+,% nofoot/.style={foot=,foot/font=,foot/rule=}, left/.style={head/left={#1},foot/left={#1}},% left/font/.style={head/left/font={#1},foot/left/font={#1}},% left/font+/.style={head/left/font+={#1},foot/left/font+={#1}},% + left/font*/.alias=left/font+,% center/.style={head/center={#1},foot/center={#1}},% center/font/.style={head/center/font={#1},foot/center/font={#1}},% center/font+/.style={head/center/font+={#1},foot/center/font+={#1}},% + center/font*/.alias=center/font+,% right/.style={head/right={#1},foot/right={#1}},% right/font/.style={head/right/font={#1},foot/right/font={#1}},% right/font+/.style={head/right/font+={#1},foot/right/font+={#1}},% + right/font*/.alias=right/font+,% head/left/.style={head/left/even={#1},head/left/odd={#1}},% head/left/font/.style={head/left/even/font={#1},head/left/odd/font={#1}},% head/left/font+/.style={head/left/even/font+={#1},head/left/odd/font+={#1}},% + head/left/font*/.alias=head/left/font+,% head/center/.style={head/center/even={#1},head/center/odd={#1}},% head/center/font/.style={head/center/even/font={#1},head/center/odd/font={#1}},% head/center/font+/.style={head/center/even/font+={#1},head/center/odd/font+={#1}},% + head/center/font*/.alias=head/center/font+,% head/right/.style={head/right/even={#1},head/right/odd={#1}},% head/right/font/.style={head/right/even/font={#1},head/right/odd/font={#1}},% head/right/font+/.style={head/right/even/font+={#1},head/right/odd/font+={#1}},% + head/right/font*/.alias=head/right/font+,% foot/left/.style={foot/left/even={#1},foot/left/odd={#1}},% foot/left/font/.style={foot/left/even/font={#1},foot/left/odd/font={#1}},% foot/left/font+/.style={foot/left/even/font+={#1},foot/left/odd/font+={#1}},% + foot/left/font*/.alias=foot/left/font+,% foot/center/.style={foot/center/even={#1},foot/center/odd={#1}},% foot/center/font/.style={foot/center/even/font={#1},foot/center/odd/font={#1}},% foot/center/font+/.style={foot/center/even/font+={#1},foot/center/odd/font+={#1}},% + foot/center/font*/.alias=foot/center/font+,% foot/right/.style={foot/right/even={#1},foot/right/odd={#1}},% foot/right/font/.style={foot/right/even/font={#1},foot/right/odd/font={#1}},% foot/right/font+/.style={foot/right/even/font+={#1},foot/right/odd/font+={#1}},% + foot/right/font*/.alias=foot/right/font+,% head/left/odd/.fancy@hf=olh,% - head/left/odd/font/.store as code=+,% + head/left/odd/font/.store as code,% odd/head/left/.alias=head/left/odd,% odd/head/left/font/.alias*=head/left/odd/font,% head/odd/left/.alias=head/left/odd,% head/odd/left/font/.alias*=head/left/odd/font,% head/center/odd/.fancy@hf=och,% - head/center/odd/font/.store as code=+,% + head/center/odd/font/.store as code,% odd/head/center/.alias=head/center/odd,% odd/head/center/font/.alias*=head/center/odd/font,% head/odd/center/.alias=head/center/odd,% head/odd/center/font/.alias*=head/center/odd/font,% head/right/odd/.fancy@hf=orh,% - head/right/odd/font/.store as code=+,% + head/right/odd/font/.store as code,% odd/head/right/.alias=head/right/odd,% odd/head/right/font/.alias*=head/right/odd/font,% head/odd/right/.alias=head/right/odd,% head/odd/right/font/.alias*=head/right/odd/font,% head/left/even/.fancy@hf=elh,% - head/left/even/font/.store as code=+,% + head/left/even/font/.store as code,% even/head/left/.alias=head/left/even,% even/head/left/font/.alias*=head/left/even/font,% head/even/left/.alias=head/left/even,% head/even/left/font/.alias*=head/left/even/font,% head/center/even/.fancy@hf=ech,% - head/center/even/font/.store as code=+,% + head/center/even/font/.store as code,% even/head/center/.alias=head/center/even,% even/head/center/font/.alias*=head/center/even/font,% head/even/center/.alias=head/center/even,% head/even/center/font/.alias*=head/center/even/font,% head/right/even/.fancy@hf=erh,% - head/right/even/font/.store as code=+,% + head/right/even/font/.store as code,% even/head/right/.alias=head/right/even,% even/head/right/font/.alias*=head/right/even/font,% head/even/right/.alias=head/right/even,% even/head/right/font/.alias*=head/right/even/font,% foot/left/odd/.fancy@hf=olf,% - foot/left/odd/font/.store as code=+,% + foot/left/odd/font/.store as code,% odd/foot/left/.alias=foot/left/odd,% odd/foot/left/font/.alias*=foot/left/odd/font,% foot/odd/left/.alias=foot/left/odd,% foot/odd/left/font/.alias*=foot/left/odd/font,% foot/center/odd/.fancy@hf=ocf,% - foot/center/odd/font/.store as code=+,% + foot/center/odd/font/.store as code,% odd/foot/center/.alias=foot/center/odd,% odd/foot/center/font/.alias*=foot/center/odd/font,% foot/odd/center/.alias=foot/center/odd,% foot/odd/center/font/.alias*=foot/center/odd/font,% foot/right/odd/.fancy@hf=orf,% - foot/right/odd/font/.store as code=+,% + foot/right/odd/font/.store as code,% odd/foot/right/.alias=foot/right/odd,% odd/foot/right/font/.alias*=foot/right/odd/font,% odd/foot/right/.alias=foot/right/odd,% odd/foot/right/font/.alias*=foot/right/odd/font,% foot/left/even/.fancy@hf=elf,% - foot/left/even/font/.store as code=+,% + foot/left/even/font/.store as code,% even/foot/left/.alias=foot/left/even,% even/foot/left/font/.alias*=foot/left/even/font,% foot/even/left/.alias=foot/left/even,% foot/even/left/font/.alias*=foot/left/even/font,% foot/center/even/.fancy@hf=ecf,% - foot/center/even/font/.store as code=+,% + foot/center/even/font/.store as code,% even/foot/center/.alias=foot/center/even,% even/foot/center/font/.alias*=foot/center/even/font,% foot/even/center/.alias=foot/center/even,% foot/even/center/font/.alias*=foot/center/even/font,% foot/right/even/.fancy@hf=erf,% - foot/right/even/font/.store as code=+,% + foot/right/even/font/.store as code,% even/foot/right/.alias=foot/right/even,% even/foot/right/font/.alias*=foot/right/even/font,% foot/even/right/.alias=foot/right/even,% foot/even/right/font/.alias*=foot/right/even/font,% offset/.style={head/offset={#1},foot/offset={#1}},% + offset+/.style={head/offset+={#1},foot/offset+={#1}},% + offset-/.style={head/offset-={#1},foot/offset-={#1}},% + offset*/.style={head/offset*={#1},foot/offset*={#1}},% head/offset/.style={head/left/offset={#1},head/right/offset={#1}},% - offset/head/.alias=head/offset,% + head/offset+/.style={head/left/offset+={#1},head/right/offset+={#1}},% + head/offset-/.style={head/left/offset-={#1},head/right/offset-={#1}},% + head/offset*/.style={head/left/offset*={#1},head/right/offset*={#1}},% + offset/head/.alias*=head/offset,% foot/offset/.style={foot/left/offset={#1},foot/right/offset={#1}},% - offset/foot/.alias=foot/offset,% - head/left/offset/.style={head/left/even/offset={#1},head/left/odd/offset={#1}},% - offset/head/left/.alias=head/left/offset,% - head/right/offset/.style={head/right/even/offset={#1},head/right/odd/offset={#1}},% - offset/head/right/.alias=head/right/offset,% + foot/offset+/.style={foot/left/offset+={#1},foot/right/offset+={#1}},% + foot/offset-/.style={foot/left/offset-={#1},foot/right/offset-={#1}},% + foot/offset*/.style={foot/left/offset*={#1},foot/right/offset*={#1}},% + offset/foot/.alias*=foot/offset,% + left/offset/.style={foot/left/offset={#1},head/left/offset={#1}},% + left/offset+/.style={foot/left/offset+={#1},head/left/offset+={#1}},% + left/offset-/.style={foot/left/offset-={#1},head/left/offset-={#1}},% + left/offset*/.style={foot/left/offset*={#1},head/left/offset*={#1}},% + offset/left/.alias*=left/offset,% + right/offset/.style={foot/right/offset={#1},head/right/offset={#1}},% + right/offset+/.style={foot/right/offset+={#1},head/right/offset+={#1}},% + right/offset-/.style={foot/right/offset-={#1},head/right/offset-={#1}},% + right/offset*/.style={foot/right/offset*={#1},head/right/offset*={#1}},% + offset/right/.alias*=right/offset,% + head/left/offset/.style={head/left/even/offset={#1},head/left/odd/offset={#1}},% + head/left/offset+/.style={head/left/even/offset+={#1},head/left/odd/offset+={#1}},% + head/left/offset-/.style={head/left/even/offset-={#1},head/left/odd/offset-={#1}},% + head/left/offset*/.style={head/left/even/offset*={#1},head/left/odd/offset*={#1}},% + offset/head/left/.alias*=head/left/offset,% + offset/left/head/.alias*=head/left/offset,% + head/right/offset/.style={head/right/even/offset={#1},head/right/odd/offset={#1}},% + head/right/offset+/.style={head/right/even/offset+={#1},head/right/odd/offset+={#1}},% + head/right/offset-/.style={head/right/even/offset-={#1},head/right/odd/offset-={#1}},% + head/right/offset*/.style={head/right/even/offset*={#1},head/right/odd/offset*={#1}},% + offset/head/right/.alias*=head/right/offset,% + offset/right/head/.alias*=head/right/offset,% foot/left/offset/.style={foot/left/even/offset={#1},foot/left/odd/offset={#1}},% - offset/foot/left/.alias=foot/left/offset,% + foot/left/offset+/.style={foot/left/even/offset+={#1},foot/left/odd/offset+={#1}},% + foot/left/offset-/.style={foot/left/even/offset-={#1},foot/left/odd/offset-={#1}},% + foot/left/offset*/.style={foot/left/even/offset*={#1},foot/left/odd/offset*={#1}},% + offset/foot/left/.alias*=foot/left/offset,% + offset/left/foot/.alias*=foot/left/offset,% foot/right/offset/.style={foot/right/even/offset={#1},foot/right/odd/offset={#1}},% - offset/foot/right/.alias=foot/right/offset,% - head/left/even/offset/.store in skip cs=f@ncyO@elh,% - offset/head/left/even/.alias=head/left/even/offset,% - head/left/odd/offset/.store in skip cs=f@ncyO@olh,% - offset/head/left/odd/.alias=head/left/odd/offset,% - head/right/even/offset/.store in skip cs=f@ncyO@erh,% - offset/head/right/even/.alias=head/right/even/offset,% - head/right/odd/offset/.store in skip cs=f@ncyO@orh,% - offset/head/right/odd/.alias=head/right/odd/offset,% + foot/right/offset+/.style={foot/right/even/offset+={#1},foot/right/odd/offset+={#1}},% + foot/right/offset-/.style={foot/right/even/offset-={#1},foot/right/odd/offset-={#1}},% + foot/right/offset*/.style={foot/right/even/offset*={#1},foot/right/odd/offset*={#1}},% + offset/foot/right/.alias*=foot/right/offset,% + offset/right/foot/.alias*=foot/right/offset,% + head/left/even/offset/.store in skip cs=f@ncyO@elh,% + head/left/even/offset/.append code=\fancy@setoffs,% + offset/head/left/even/.alias*=head/left/even/offset,% + head/left/odd/offset/.store in skip cs=f@ncyO@olh,% + head/left/odd/offset/.append code=\fancy@setoffs,% + offset/head/left/odd/.alias*=head/left/odd/offset,% + offset/head/left/odd/.alias*=head/left/odd/offset,% + head/right/even/offset/.store in skip cs=f@ncyO@erh,% + head/right/even/offset/.append code=\fancy@setoffs,% + offset/head/right/even/.alias*=head/right/even/offset,% + head/right/odd/offset/.store in skip cs=f@ncyO@orh,% + head/right/odd/offset/.append code=\fancy@setoffs,% + offset/head/right/odd/.alias*=head/right/odd/offset,% foot/left/even/offset/.store in skip cs=f@ncyO@elf,% - offset/foot/left/even/.alias=foot/left/even/offset,% + foot/left/even/offset/.append code=\fancy@setoffs,% + offset/foot/left/even/.alias*=foot/left/even/offset,% foot/left/odd/offset/.store in skip cs=f@ncyO@olf,% - offset/foot/left/odd/.alias=foot/left/odd/offset,% - foot/right/even/offset/.store in skip cs=f@ncyO@erf,% - offset/foot/right/even/.alias=foot/right/even/offset,% - foot/right/odd/offset/.store in skip cs=f@ncyO@orf,% - offset/foot/right/odd/.alias=foot/right/odd/offset,% + foot/left/odd/offset/.append code=\fancy@setoffs,% + offset/foot/left/odd/.alias*=foot/left/odd/offset,% + foot/right/even/offset/.store in skip cs=f@ncyO@erf,% + foot/right/even/offset/.append code=\fancy@setoffs,% + offset/foot/right/even/.alias*=foot/right/even/offset,% + foot/right/odd/offset/.store in skip cs=f@ncyO@orf,% + foot/right/odd/offset/.append code=\fancy@setoffs,% + offset/foot/right/odd/.alias*=foot/right/odd/offset,% reset/.style={norule,head=,foot=,offset=\z@,foot/rule/skip,rule/font=,font=},% reset/.value forbidden,% }% keys for \pagesetup (stored into token \itf@tk) diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty index 72d299bb72e..5891236408f 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.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-fancyvrb} - [2010/08/22 v1.0 Custom verbatim environments (FC)] + [2010/10/27 v1.2 Custom verbatim environments (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{fancyvrb} \itf@pgfkeys diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty index ccb39c77aa3..8819bc539d1 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.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-hypbmsec} - [2010/10/05 v1.0 lastsection etc. (FC)] + [2010/10/27 v1.2 lastsection etc. (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{hypbmsec} \AfterPackage*{interfaces-titlesec}{% requires interface-titlesec diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty index 08796098963..a122bd3c026 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.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-hyperref} - [2010/08/08 v1.0 provides raised hyperdef (FC)] + [2010/10/27 v1.2 provides raised hyperdef (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{hyperref} \newrobustcmd\raisedhyperdef[4][]{\begingroup diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty index fa20c8f0ac0..9d3e0b92bff 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.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-makecell} - [2010/10/12 v1.0 more control on tabular cells (FC)] + [2010/10/27 v1.2 more control on tabular cells (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{makecell} \edef\itf@AtEnd{\catcode126 \the\catcode126}% 126 = ~ diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty index 084238ee61e..9757f2aeea0 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/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-marks} - [2010/10/12 v1.0 easier use of e-TeX marks (FC)] + [2010/10/27 v1.2 easier use of e-TeX marks (FC)] \RequirePackage{interfaces-base} \newrobustcmd\marksthe[2]{% \ifcsname marks@#1\endcsname\else @@ -57,9 +57,11 @@ \ifcsname marks@#1\endcsname\else \itf@marks@new{#1}% \fi - \expandafter\marks\csname marks@#1\endcsname{% - \unexpanded\expandafter\expandafter\expandafter{% - \csname#2\endcsname}}% + \ifcsundef{#2} + {} + {\expandafter\marks\csname marks@#1\endcsname{% + \unexpanded\expandafter\expandafter\expandafter{% + \csname#2\endcsname}}}% }% \marksthecs \def\itf@marks@new#1{% \expandafter\newmarks\csname marks@#1\endcsname diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty index 7e4ec13cff5..6347d988c1e 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.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-pgfkeys} - [2010/10/22 v1.1 pgfkeys handlers definitions (FC)] + [2010/10/27 v1.2 pgfkeys handlers definitions (FC)] \RequirePackage{interfaces-base} \AtEndOfPackage{% \let\itf@pgfkeys@unpack\pgfkeys@unpack diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty index fca7b627f6c..2fea8b7f97f 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.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-scrlfile} - [2010/08/09 v1.0 scrlfile hooks improved (FC)] + [2010/10/27 v1.2 scrlfile hooks improved (FC)] \RequirePackage{interfaces-base} \AfterEndPreamble{% \let\@pkgextension\ltx@pkgextension diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty index 920adbcc31b..4ff52230a3b 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.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-tikz} - [2010/09/21 v1.0 load of tikz libraries easily (FC)] + [2010/10/27 v1.2 load of tikz libraries easily (FC)] \RequirePackage{interfaces-base} \itf@pgfkeys %% Some catcode checking diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty index 4ac65b17da9..2dc5fd60f5f 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.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-titlesec} - [2010/10/20 v1.0 pgfkeys macros for titlesec (FC)] + [2010/10/27 v1.2 pgfkeys macros for titlesec (FC)] \RequirePackage{interfaces-base} \RequirePackage{auxhook}% for fix for \ttlp@append (odd/even pages, not implemented in interfaces) \itf@Check@Package{titlesec} @@ -81,7 +81,7 @@ {\pgfqkeys{/itf/titlesec/#1#2} {/itf/titlesec/@setup={#1}{#2},#4,/itf/titlesec/@update={#1}{#2}}} {\pgfqkeys{/itf/titlesec/#1#2} - {/itf/titlesec/@setup={#1}{#2},shape={#3},#4,/itf/titlesec/@update={#1}{#2}}}% + {/itf/titlesec/@setup={#1}{#2},#4,shape={#3},/itf/titlesec/@update={#1}{#2}}}% }% \itf@ttl@sectionformat %% private keys @setup and @update \pgfqkeys{/itf/titlesec}{% @@ -196,7 +196,7 @@ \def\itf@ttl@createsection#1{% sectionning command undefined: temporarily defined \expandafter\titleclass\csname#1\endcsname{straight}[*]% in straight class \itf@AfterPackage{hypbmsec}{% - \AtBeginDocument{% + \AfterPreamble{% \csletcs{hbs@#1}{#1}% \csxdef{#1}{\noexpand\hbs@do\expandafter\noexpand\csname hbs@#1\endcsname}% }% @@ -205,9 +205,9 @@ \itf@cft@newsection{#1}{toc}% }% \itf@AfterPackage{interfaces-hypbmsec}{% - \cslet{last#1title}\@empty - \cslet{last#1bookmark}\@empty - \cslet{last#1toc}\@empty + \expandafter\let\csname last#1title\endcsname\relax + \expandafter\let\csname last#1bookmark\endcsname\relax + \expandafter\let\csname last#1toc\endcsname\relax }% }% \itf@ttl@createsection %%----------------------------------------------------------------------------- @@ -234,7 +234,9 @@ }% \pgfqkeys{/itf/titlesec/#1#2}{% shape/.value required,% - shape@cs/.initial=\csname ttlh@\pgfkeysvalueof{/itf/titlesec/#1#2/shape}\endcsname,% constant + shape@cs/.initial= + \ifdefined\itf@last@from@next\itf@last@from@next{#1}\fi % interfaces-hypbmsec + \csname ttlh@\pgfkeysvalueof{/itf/titlesec/#1#2/shape}\endcsname,% constant shape@cs/.is private=interface-titlesec,% constant font/.store as code,% format/.alias*=font,% diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty index af838e4294b..e69fdb47ef1 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.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-tocloft} - [2010/07/23 v1.0 pgfkeys macros for tocloft (FC)] + [2010/10/27 v1.2 pgfkeys macros for tocloft (FC)] \RequirePackage{interfaces-base} \itf@Check@Package{tocloft} \itf@pgfkeys @@ -130,6 +130,7 @@ columns/rule/.default=\columnseprule,% columns/rule,% assign default columnseprule/.alias*=columns/rule,% + columns/rule/width/.alias*=columns/rule,% columns/sep/.store as dimen,% columns/sep/.default=\columnsep,% columns/sep/.blank=10\p@,% @@ -335,7 +336,6 @@ {\PackageWarning{interfaces-tocloft} {Command \string\@cftmakelottitle\space could not be patched \MessageBreak label and bookmark keys for \string\lotsetup\space won't work}}% -\@makeother\# \itf@patch\apptocmd\newlistentry {\itf@cft@newlistof{#2}} {\PackageInfo{interfaces-tocloft} @@ -343,7 +343,6 @@ {\PackageWarning{interfaces-tocloft} {Command \string\newlistentry\space could not be patched \MessageBreak \string\listofsetup\space will not work}}% -\catcode`\#=6 \def\itf@tocloft#1#2#3{% \expandafter\def\expandafter#1\expandafter{% \expandafter\itf@cft@label diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty index fd8ad7ea9b8..a52e1504781 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.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 @@ -117,7 +117,7 @@ \expandafter{\itf@trunc@width}% %% total=\the\dimexpr#1\relax }% \itf@htruncadjust -\def\itf@scalefactor#1#2{\strip@pt\dimexpr#1*65536/\number#2\relax} +\def\itf@scalefactor#1#2{\strip@pt\dimexpr#1*65536/#2\relax} \def\itf@scaledimen#1*#2/#3\relax{% \dimexpr\itf@scalefactor{#2}{#3}\dimexpr#1\relax\relax }% \itf@scaledimen diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty index 8d3dae71633..d552fc4b706 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces.sty index ee2d6ed1965..57d430c43b6 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces.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 @@ -46,7 +46,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{interfaces} - [2010/10/20 v1.0 - pgfkeys macros for other packages (FC)] + [2010/10/27 v1.2 - pgfkeys macros for other packages (FC)] \RequirePackage{interfaces-base} \DeclareOption{LaTeX}{\AtEndOfPackage{\LoadInterface{LaTeX}}} \DeclareOption{marks}{\AtEndOfPackage{\LoadInterface{marks}}} |