summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/skeyval/skeyval-ltxpatch.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/skeyval/skeyval-ltxpatch.sty')
-rw-r--r--Master/texmf-dist/tex/latex/skeyval/skeyval-ltxpatch.sty48
1 files changed, 27 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/skeyval/skeyval-ltxpatch.sty b/Master/texmf-dist/tex/latex/skeyval/skeyval-ltxpatch.sty
index e44d3b50f7b..82d624e3985 100644
--- a/Master/texmf-dist/tex/latex/skeyval/skeyval-ltxpatch.sty
+++ b/Master/texmf-dist/tex/latex/skeyval/skeyval-ltxpatch.sty
@@ -1,5 +1,5 @@
%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file 'skeyval-ltxpatch.sty', version 1.1, 2012/10/15. %
+% This is file 'skeyval-ltxpatch.sty', version 1.1a, 2012/10/16. %
% %
% The rationale for this package: the patch in 'xkvltxp' package isn't %
% strong enough. %
@@ -42,9 +42,15 @@
\expandafter\do
\fi
}%
- \edef\skvltxp@restorecodes{\do035,064,123,125,061,059,\do,}%
+ \edef\skv@ltxp@restorecodes{\do35,64,123,125,61,59,13,\do,}%
}
\skv@prova
+
+\edef\skv@ltxp@restorecodes{%
+ \unexpanded\expandafter{\skv@ltxp@restorecodes}%
+ \endlinechar\the\endlinechar\relax
+}
+\endlinechar13 %
\catcode035 06 % #
\catcode064 11 % @
\catcode123 01 % {
@@ -53,8 +59,8 @@
\catcode044 12 % ,
\def\do#1=#2,{%
\ifx\do#1\else
- \edef\skvltxp@restorecodes{%
- \skvltxp@restorecodes
+ \edef\skv@ltxp@restorecodes{%
+ \unexpanded\expandafter{\skv@ltxp@restorecodes}%
\catcode#1=\the\catcode#1\relax
}%
\catcode#1=#2\relax
@@ -66,12 +72,13 @@
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\ProvidesPackage{skeyval-ltxpatch}
- [2012/10/15 v1.1 Patches for LaTeX2e kernel options processing (AM)]
+ [2012/10/16 v1.1a Patches for LaTeX2e kernel options processing (AM)]
+\ifdefined\skvz@\else\newdimen\skvz@\fi
\def\@space{ }
\protected\def\skvltxptracingall{%
\tracinggroups\@ne\tracingifs\@ne\loggingall\tracingassigns\@ne
- \tracingonline\z@\tracingifs\z@
+ \tracingonline\skvz@\tracingifs\skvz@
}
\let\skvltxploggingall\skvltxptracingall
@@ -105,12 +112,13 @@
\edef#1{\expandafter\skvltxp@trimspace\expandafter{#1}}%
}
-% \skvltxp@normalize isn't meant for normalizing keyval lists.
-\protected\def\skvltxp@setupnormalizer#1{%
+% \skvltxp@setupnormalizer{<parser>}<normalizer.cmd>
+% <normalizer.cmd> should not be used for normalizing keyval lists.
+\protected\def\skvltxp@setupnormalizer#1#2{%
\begingroup
\lccode`\~=`#1\relax
\lowercase{\endgroup
- \def\skvltxp@normalize##1{%
+ \def#2##1{%
\unexpanded\expandafter
{\romannumeral\skvltxp@activeparser#1##1#1~\skv@nil}%
}%
@@ -138,10 +146,7 @@
}%
}%
}
-\def\skvltxp@commanormalize#1{%
- \skvltxp@setupnormalizer{,}%
- \edef#1{\expandafter\skvltxp@normalize\expandafter{#1}}%
-}
+\skvltxp@setupnormalizer{,}\skvltxp@commanormalize
\newif\ifbreakkerpaloop
\def\kerpaloopdepth{0}
@@ -176,13 +181,14 @@
}%
\xdef\kerpaloopdepth{\the\numexpr\kerpaloopdepth-1}%
}
+% \skvltxp@getoptionnames<cmd.in><cmd.out>
\def\skvltxp@getoptionnames#1#2{%
\def#2{}%
- \skvltxp@commanormalize#1%
- \def\do##1=##2\skv@nil{%
- \edef#2{\ifx#2\@empty\else#2,\fi##1}%
+ \edef#1{\expandafter\skvltxp@commanormalize\expandafter{#1}}%
+ \def\do##1=##2=##3\skv@nil{%
+ \edef#2{\ifx\@empty#2\else#2,\fi##1}%
}%
- \kerpaloop*{,}#1{\do##1=\skv@nil}%
+ \kerpaloop*{,}#1{\do##1==\skv@nil}%
}
\def\@ptionlist#1{%
\@ifundefined{opt@#1}{}{\unexpanded\expandafter
@@ -192,9 +198,9 @@
\@expandtwoargs\@if@pti@ns{\@ptionlist{#2.#1}}{\unexpanded{#3}}%
}
\def\@if@pti@ns#1#2{%
- \skvltxp@setupnormalizer{,}%
- \edef\skv@options@i{\skvltxp@normalize{#1}}%
- \edef\skv@options@ii{\skvltxp@normalize{#2}}%
+% \skvltxp@setupnormalizer{,}%
+ \edef\skv@options@i{\skvltxp@commanormalize{#1}}%
+ \edef\skv@options@ii{\skvltxp@commanormalize{#2}}%
\ifx\skv@options@i\skv@options@ii
\def\skv@tempa{\expandafter\@firstoftwo\@gobbletwo}%
\else
@@ -431,7 +437,7 @@
}
\let\@@fileswith@pti@ns\@fileswith@pti@ns
-\skvltxp@restorecodes
+\skv@ltxp@restorecodes
\endinput
%% End of file `skeyval-ltxpatch.sty'.