summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-20 22:58:44 +0000
committerKarl Berry <karl@freefriends.org>2017-03-20 22:58:44 +0000
commit9fae8e024addafd50bf3d885ffa790654bf0c4a0 (patch)
tree3394d20abc9d298b72b95c18a89513ea75c30059
parentdbb860373fff5ef417296c89ed35a45a71bbaa4d (diff)
conv-xkv (20mar17)
git-svn-id: svn://tug.org/texlive/trunk@43558 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/conv-xkv/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/conv-xkv/doc/conv-xkv.pdfbin100538 -> 86415 bytes
-rw-r--r--Master/texmf-dist/source/latex/conv-xkv/conv-xkv.dtx12
-rw-r--r--Master/texmf-dist/tex/latex/conv-xkv/conv-xkv.sty4
4 files changed, 11 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/conv-xkv/README.md b/Master/texmf-dist/doc/latex/conv-xkv/README.md
index efca36d48aa..398e0e02e5a 100644
--- a/Master/texmf-dist/doc/latex/conv-xkv/README.md
+++ b/Master/texmf-dist/doc/latex/conv-xkv/README.md
@@ -1,6 +1,6 @@
The conv-xkv Package
Author: D. P. Story
-Dated: 2017/01/09
+Dated: 2017-02-17
This small package supports key-value syntax other than the standard latex
syntax of <key>=<value>. Using this package, create key-values of the form
diff --git a/Master/texmf-dist/doc/latex/conv-xkv/doc/conv-xkv.pdf b/Master/texmf-dist/doc/latex/conv-xkv/doc/conv-xkv.pdf
index ebfb29e660d..73e51289e49 100644
--- a/Master/texmf-dist/doc/latex/conv-xkv/doc/conv-xkv.pdf
+++ b/Master/texmf-dist/doc/latex/conv-xkv/doc/conv-xkv.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/conv-xkv/conv-xkv.dtx b/Master/texmf-dist/source/latex/conv-xkv/conv-xkv.dtx
index 57fc4b6e194..2815654df2c 100644
--- a/Master/texmf-dist/source/latex/conv-xkv/conv-xkv.dtx
+++ b/Master/texmf-dist/source/latex/conv-xkv/conv-xkv.dtx
@@ -14,7 +14,7 @@
%</copyright>
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{conv-xkv}
-%<package> [2017/01/09 v1.1b convert xkeyval format (dps)]
+%<package> [2017/02/17 v1.1c convert xkeyval format (dps)]
%<*driver>
\documentclass{ltxdoc}
\usepackage[colorlinks,hyperindex=false]{hyperref}
@@ -196,9 +196,9 @@
\def\usekvdelim#1{\@nameuse{kvdelim-#1}}
% \end{macrocode}
% \begin{macro}{\DeclareDelimiter}
-% In the preamble, we declare the delimiter to be used. The command takes on argument, which
+% In the preamble, we declare the delimiter to be used. The command takes one argument, which
% is the delimiter to be used, for example `\texttt{:}' or `\texttt{->}'. If this declaration
-% does not appear in the preamble, the delimited is taken to be `\texttt{:}'.
+% does not appear in the preamble, the delimiter is taken to be `\texttt{:}'.
% \begin{macrocode}
\def\DeclareDelimiter{\ckv@SetCatcodes\DeclareDelimiter@i}
\def\DeclareDelimiter@i#1#2{\@ifundefined{kvdelim-#1}
@@ -366,7 +366,11 @@
\@nameuse{cxkv@cnvrtDelimniiEqual-#1}\cxkv@key
\@nameuse{kvdelim-#1}#3,#4\noexpand\@nil}
\else
- \cxkv@tmptoks=\expandafter{\cxkv@scratch,#2=#3}%
+% \end{macrocode}
+% (2017/02/17) Enclose \texttt{\#3} in braces
+% \changes{v1.1c}{2017/02/17}{Enclose \string\texttt{\#3} in braces}
+% \begin{macrocode}
+ \cxkv@tmptoks=\expandafter{\cxkv@scratch,#2={#3}}%
\edef\cxkv@scratch{\the\cxkv@tmptoks}%
\def\cxkv@next{%
\@nameuse{cxkv@cnvrtDelimniiEqual-#1}#4\@nil}\fi
diff --git a/Master/texmf-dist/tex/latex/conv-xkv/conv-xkv.sty b/Master/texmf-dist/tex/latex/conv-xkv/conv-xkv.sty
index 0da4b2b044b..f8336f9d44c 100644
--- a/Master/texmf-dist/tex/latex/conv-xkv/conv-xkv.sty
+++ b/Master/texmf-dist/tex/latex/conv-xkv/conv-xkv.sty
@@ -19,7 +19,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{conv-xkv}
- [2017/01/09 v1.1b convert xkeyval format (dps)]
+ [2017/02/17 v1.1c convert xkeyval format (dps)]
\RequirePackage{xkeyval}
\begingroup
\@makeother\`%
@@ -203,7 +203,7 @@
\@nameuse{cxkv@cnvrtDelimniiEqual-#1}\cxkv@key
\@nameuse{kvdelim-#1}#3,#4\noexpand\@nil}
\else
- \cxkv@tmptoks=\expandafter{\cxkv@scratch,#2=#3}%
+ \cxkv@tmptoks=\expandafter{\cxkv@scratch,#2={#3}}%
\edef\cxkv@scratch{\the\cxkv@tmptoks}%
\def\cxkv@next{%
\@nameuse{cxkv@cnvrtDelimniiEqual-#1}#4\@nil}\fi