diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/skeyval/skeyval-view.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/skeyval/skeyval-view.sty | 74 |
1 files changed, 44 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/skeyval/skeyval-view.sty b/Master/texmf-dist/tex/latex/skeyval/skeyval-view.sty index fc078fd2378..6e40b3d6611 100644 --- a/Master/texmf-dist/tex/latex/skeyval/skeyval-view.sty +++ b/Master/texmf-dist/tex/latex/skeyval/skeyval-view.sty @@ -1,5 +1,5 @@ %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++% -% This is file 'skeyval-view.sty', version 1.1, 2012/10/15. % +% This is file 'skeyval-view.sty', version 1.1a, 2012/10/16. % % % % This package and accompanying files may be distributed and/or % % modified under the conditions of the LaTeX Project Public License, % @@ -39,9 +39,15 @@ \expandafter\do \fi }% - \edef\skvv@restorecodes{\do035,064,123,125,061,059,\do,}% + \edef\skv@view@restorecodes{\do35,64,123,125,61,59,13,\do,}% } \skv@prova + +\edef\skv@view@restorecodes{% + \unexpanded\expandafter{\skv@view@restorecodes}% + \endlinechar\the\endlinechar\relax +} +\endlinechar13 % \catcode035 06 % # \catcode064 11 % @ \catcode123 01 % { @@ -50,8 +56,8 @@ \catcode044 12 % , \def\do#1=#2,{% \ifx\do#1\else - \edef\skvv@restorecodes{% - \skvv@restorecodes + \edef\skv@view@restorecodes{% + \unexpanded\expandafter{\skv@view@restorecodes}% \catcode#1=\the\catcode#1\relax }% \catcode#1=#2\relax @@ -63,7 +69,7 @@ \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesPackage{skeyval-view} - [2012/10/15 v1.1 Viewer utility for skeyval package (AM)] + [2012/10/16 v1.1a Viewer utility for skeyval package (AM)] \@ifpackageloaded{skeyval}{}{\RequirePackage{skeyval}} \directkeys*{% .prefix=SKVV, @@ -71,12 +77,12 @@ .holder prefix=skvv@, .initialize keys after define, .every unknown option={ - \PackageWarning{skeyval-view}{Unknown option '\CurrentOption'}% + \PackageWarning{skeyval-view}{Unknown option '\CurrentOption' ignored}% }, .new options={ % LaTeX's options processor will zap the option names. So these keys % can't have spaces between their parts. - .ords/{xcolor-options,load-xcolor-with}// + .ord/{xcolor-options,load-xcolor-with}// \edef\skvv@xcoloroptions{\unexpanded{#1}} \skvstripouterbraces{1}\skvv@xcoloroptions, }, @@ -100,17 +106,17 @@ .holder prefix=skvv@, .initialize after define=false, .define keys={ - .ords/{file,wcolsep,weol}/\@nil/ + .ord/{file,wcolsep,weol}/\@nil/ \skvcsedef{skvv@\skvcurrentkey}{\unexpanded{#1}} \skvaftercsname{\skvstripouterbraces{1}}{skvv@\skvcurrentkey} \skvaftercsname\skvdespacecontent{skvv@\skvcurrentkey} , - .ords/{prefix,family,type,default,columns}/\@nil/ + .ord/{prefix,family,type,default,columns}/\@nil/ \skvcsedef{skvv@\skvcurrentkey}{\unexpanded{#1}} \skvaftercsname{\skvstripouterbraces{1}}{skvv@\skvcurrentkey} \skvaftercsname\skvcsvnormalize{skvv@\skvcurrentkey} , - .bools/{view,vlabels,wlabels}/true, + .bool/{view,vlabels,wlabels}/true, .ord/length of default/20/\def\skvv@lod{#1}, .cmd/color/black, }, @@ -152,7 +158,7 @@ }% } \protected\def\skv@ordkey@a#1[#2]#3{% - \skvifstrcmp{#2}{^skv^}{% + \skvifstrcmpTF{#2}{^skv^}{% \skvv@tabulate{#1}{ordinary}{[none]}% }{% \skv@definedefault{#1}{#2}% @@ -162,7 +168,7 @@ } \protected\def\skv@cmdkey#1#2[#3]#4{% \skv@strippointers{#2}\skvcurrentkey - \skvifdefbool{skv@st}{% + \skvifdefboolTF{skv@st}{% \skv@definedefault\skvcurrentkey{#3}% \skvv@tabulate\skvcurrentkey{command}{#3}% }{% @@ -172,26 +178,35 @@ % spaces in key name: \edef\skv@prova{#1\skvcurrentkey}% \edef\skv@prova{\expandafter\skv@zapornot\expandafter - {\expandafter\skv@zapnr\expandafter}\expandafter{\skv@prova}}% + {\expandafter\skv@zapsw\expandafter}\expandafter{\skv@prova}}% \skvcslet{\skv@header\skvcurrentkey.@hp}\skv@prova \skvcsedef{\skv@header\skvcurrentkey.@cbk}{\unexpanded{#4}}% } -\protected\def\skv@choicekey@c[#1]{% - \skvifstrcmp{#1}{^skv^}{% - \skvv@tabulate\skvcurrentkey{choice}{[none]}% - }{% - \skv@definedefault\skvcurrentkey{#1}% - \skvv@tabulate\skvcurrentkey{choice}{#1}% +\protected\def\skv@choicekey@g{% + \skvcommaparse*\skv@currlist\skv@prova{% + \skvexpbracenext\skv@strippointers\skv@prova\skvcurrentkey + \ifx\skv@default\skv@rej + \skvv@tabulate\skvcurrentkey{choice}{[none]}% + \else\skvafterfi + \skvexpanded{% + \noexpand\skvv@tabulate + {\skvxonce\skvcurrentkey}{choice}{\skvxonce\skv@default}% + \noexpand\skv@definedefault + {\skvxonce\skvcurrentkey}{\skvxonce\skv@default}% + }% + \fi + \skvcsedef{\skv@header\skvcurrentkey.@hp}{\skv@hp\skvcurrentkey}% + \skvcsedef{\skv@header\skvcurrentkey.@cbk}{\the\skv@toksa}% }% - \skvifdefbool{skv@pl}\skv@choicekey@e\skv@choicekey@d } \protected\def\skv@boolkey@c#1#2#3#4{% - \skvcsnewif{\skv@zapornot{\skv@zapnr}{#2}}% - \skvifdefbool{skv@st}{% + \skvcsnewif{\skv@zapornot{\skv@zapsw}{#2}}% + \edef\skvv@boolortog{\if\skv@typetogkey toggle\else bool\fi}% + \skvifdefboolTF{skv@st}{% \skv@definedefault{#1}{#3}% - \skvv@tabulate{#1}{bool}{#3}% + \skvv@tabulate{#1}{\skvv@boolortog}{#3}% }{% - \skvv@tabulate{#1}{bool}{[none]}% + \skvv@tabulate{#1}{\skvv@boolortog}{[none]}% }% \edef\skv@tempa##1##2{% \noexpand\skv@sttrue @@ -206,7 +221,7 @@ \skvcommaparse{#1}\skv@prova{% \skvexpbracenext\skv@strippointers\skv@prova\skvcurrentkey \skvexpanded{% - \skvifstrcmp{#3}{^skv^}{% + \skvifstrcmpTF{#3}{^skv^}{% \skvv@tabulate{\skvcurrentkey}{style}{[none]}% }{% \skv@definedefault{\skvcurrentkey}{\unexpanded{#3}}% @@ -314,7 +329,7 @@ } \skvrobustdef*\skvv@ifin#1#2{% \ifx#2\@nnil\else - \skvxifin{,\detokenize{#1},}{,\skvoxdetok{#2},}{}\skv@swafalse + \skvxifinTF{,\detokenize{#1},}{,\skvoxdetok{#2},}{}\skv@swafalse \fi } @@ -324,8 +339,8 @@ .holder prefix=skvvs@, .initialize keys after define, .new keys={ - .ords/{.show,.show table}// - \skvifdefbool{skvindef}{}{ + .ord/{.show,.show table}// + \skvifdefboolTF{skvindef}{}{ \edef\skvvs@show{\unexpanded{#1}} \skvstripouterbraces{2}\skvvs@show \ifx\skvvs@show\@empty\else\skvafterfi @@ -345,8 +360,7 @@ \skvrobustdef*\skvviewkeys{\skvsetkeys[SKVV]{skvvshow}} \skvnewlet\skvshowkeys\skvviewkeys -\skvv@restorecodes - +\skv@view@restorecodes \endinput %% End of file 'skeyval-view.sty'. |