From b067e180fd68e71d2e6ee26ca3b99bdf411b10b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 8 Oct 2009 22:33:47 +0000 Subject: changelayout 0.1 (7oct09) git-svn-id: svn://tug.org/texlive/trunk@15702 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/changelayout/changelayout.sty | 63 +++++++--------------- 1 file changed, 18 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/changelayout/changelayout.sty b/Master/texmf-dist/tex/latex/changelayout/changelayout.sty index 5eaf199fbfa..67950a33567 100644 --- a/Master/texmf-dist/tex/latex/changelayout/changelayout.sty +++ b/Master/texmf-dist/tex/latex/changelayout/changelayout.sty @@ -195,36 +195,9 @@ \noexpand\cpl@info{Layout parameters reset to defaults}% }\@tempa% } -\new\def\cpl@content{No content} -\new\def\cpl@paperheight{\paperheight} -\new\def\cpl@paperwidth{\paperwidth} -\new\def\cpl@textheight{\textheight} -\new\def\cpl@textwidth{\textwidth} -\new\def\cpl@evensidemargin{\evensidemargin} -\new\def\cpl@oddsidemargin{\oddsidemargin} -\new\def\cpl@topmargin{\topmargin} -\new\def\cpl@headheight{\headheight} -\new\def\cpl@headsep{\headsep} -\new\def\cpl@footskip{\footskip} -\new\def\cpl@footins{\skip\footins} -\new\def\cpl@topsep{\topsep} -\new\def\cpl@listparindent{\listparindent} -\new\def\cpl@parindent{\parindent} -\new\def\cpl@parsep{\parsep} -\new\def\cpl@parskip{\parskip} -\new\def\cpl@leftmargin{\leftmargin} -\new\def\cpl@rightmargin{\rightmargin} -\new\def\cpl@columnwidth{\columnwidth} -\new\def\cpl@columnsep{\columnsep} -\new\def\cpl@columnseprule{\columnseprule} -\new\def\cpl@marginparwidth{\marginparwidth} -\new\def\cpl@marginparsep{\marginparsep} -\new\def\cpl@marginparpush{\marginparpush} -\new\def\cpl@hoffset{\hoffset} -\new\def\cpl@voffset{\voffset} -\new\def\cpl@textcolor{black} \define@boolkey+[KV]{changelay}[cpl@]{reset}[true]{% - \cpl@backtodefaults}{\cpl@err{Erroneous value for 'reset'}} + \ifcpl@reset\cpl@backtodefaults\fi% + }{\cpl@err{Erroneous value for 'reset'}} \define@boolkeys[KV]{changelay}[cpl@]{switchadjust,logdefault,% logfinal,strictcheck,oddpage}[true] \define@cmdkey[KV]{changelay}[cpl@]{content}[]{} @@ -255,20 +228,6 @@ \define@cmdkey[KV]{changelay}[cpl@]{marginparpush}[\marginparpush]{} \define@cmdkey[KV]{changelay}[cpl@]{hoffset}[\hoffset]{} \define@cmdkey[KV]{changelay}[cpl@]{voffset}[\voffset]{} -\DeclareCmdListParser\cpl@csvloop{,} -\new\def\cpl@cmddo#1{\csdef{cpl@x@#1}{\z@}} -\new\def\cpl@list@a{% - paperheight,paperwidth,textheight,textwidth,evensidemargin,% - oddsidemargin,topmargin,headheight,headsep,footskip,footins,topsep,% - listparindent,parindent,parsep,parskip,leftmargin,rightmargin,% - columnwidth,columnsep,columnseprule,marginparwidth,marginparsep,% - marginparpush,hoffset,voffset% -} -\new\def\cpl@definecmds{\begingroup% - \edef\@tempa{\endgroup\cpl@csvloop[\cpl@cmddo]\cpl@list@a}% - \@tempa% -} -\cpl@definecmds\undef{\cpl@list@a}\undef{\cpl@definecmds}% \define@cmdkeys[KV@X]{changelay}[cpl@x@]{% paperheight,paperwidth,textheight,textwidth,evensidemargin,% oddsidemargin,topmargin,headheight,headsep,footskip,footins,% @@ -277,8 +236,22 @@ marginparsep,marginparpush,hoffset,voffset% }[\z@] \DeclareOptionX*{\cpl@warn{Unknown option '\CurrentOption' ignored}} -\ExecuteOptionsX{} +\ExecuteOptionsX[KV][switchadjust,logdefault,logfinal, + strictcheck,oddpage]{content,textcolor, + paperheight,paperwidth,textheight,textwidth,evensidemargin, + oddsidemargin,topmargin,headheight,headsep,footskip,footins,topsep, + listparindent,parindent,parsep,parskip,leftmargin,rightmargin, + columnwidth,columnsep,columnseprule,marginparwidth,marginparsep, + marginparpush,hoffset,voffset +} \ProcessOptionsX*\relax +\setkeys[KV@X]{changelay}{% + paperheight,paperwidth,textheight,textwidth,evensidemargin, + oddsidemargin,topmargin,headheight,headsep,footskip,footins,topsep, + listparindent,parindent,parsep,parskip,leftmargin,rightmargin, + columnwidth,columnsep,columnseprule,marginparwidth,marginparsep, + marginparpush,hoffset,voffset +} \cpl@csnumdef{cpl@cnt@a}{\z@} \cpl@csnumdef{cpl@mem@c@page}{\z@} \new\def\cpl@xlabel{_x_} @@ -301,7 +274,7 @@ \@esphack } \else - \cpl@err{nofiles: I need to write in the .aux file} + \cpl@err{nofiles: I need to write to .aux file} \fi\fi \new\def\cpl@new@mem@label#1#2{\csgdef{m@#1}{#2}} \new\def\cpl@mem@labelref#1{0\csuse{m@#1}} -- cgit v1.2.3