diff options
47 files changed, 197 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf Binary files differindex 9abbe234537..e4f8cc7786e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf Binary files differindex dc8c919da9e..deb9f98b97d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf Binary files differindex 6f28927ad10..72fd16171a5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf Binary files differindex 27c8f029cfb..d0e7eaf5791 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf Binary files differindex abf7a49d6dd..fb3193eeb21 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf Binary files differindex 27620a91e24..8057cfd3392 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf Binary files differindex a3cd599e93d..2d5e29bd50f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf Binary files differindex e65b86226a9..5451a100221 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf Binary files differindex eeec24c2c8e..2fdbf9d19fc 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf Binary files differindex aa89da29f1b..b522a596272 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf Binary files differindex cf439a16fbb..27552809813 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf Binary files differindex ff310fb6a11..7cc635d0048 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf Binary files differindex 34df34e19c6..163d90c5861 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf Binary files differindex 0e2cb541d9d..9b4ea931e88 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf Binary files differindex 11ec21a8e6e..9b950d6e7b5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf Binary files differindex e45022d7fb6..5d4e32fecdb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf Binary files differindex 9e7df72d277..38ddde29494 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf Binary files differindex 086ca0e19e8..55495814d30 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf Binary files differindex 4f9edf980f1..ebeeb018107 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf Binary files differindex 6210c8772b9..76e99d8545f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf Binary files differindex e2663f0f5db..6463da9a5b0 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf Binary files differindex 4d1c07f53f7..1ba38ca6363 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf Binary files differindex 982f2454835..22f354ebaa4 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys-example.tex b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys-example.tex new file mode 100644 index 00000000000..48a07c3b9b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys-example.tex @@ -0,0 +1,77 @@ +%% +%% This is file `kvsetkeys-example.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% kvsetkeys.dtx (with options: `example') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file kvsetkeys.dtx +%% and the derived files +%% kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv, +%% kvsetkeys-example.tex. +%% +\documentclass{article} +\usepackage[T1]{fontenc} +\usepackage{kvsetkeys} +\usepackage{keyval} + +\makeatletter +\newcommand*{\tag}[2][]{% + % #1: attributes + % #2: tag name + \begingroup + \toks@={}% + \let\@endslash\@empty + \kvsetkeys{tag}{#1}% + \texttt{% + \textless #2\the\toks@\@endslash\textgreater + }% + \endgroup +} +\kv@set@family@handler{tag}{% + % #1: key + % #2: value + \toks@\expandafter{% + \the\toks@ + \space + #1=\string"#2\string"% + }% +} +\define@key{tag}{/}[]{% + \def\@endslash{/}% +} +\makeatother + +\begin{document} +\begin{tabbing} + \mbox{}\qquad\=\qquad\=\kill + \tag{html}\\ + \>\dots\\ + \>\tag[border=1]{table}\\ + \>\>\tag[width=200, span=3, /]{colgroup}\\ + \>\>\dots\\ + \>\tag{/table}\\ + \>\dots\\ + \tag{/html}\\ +\end{tabbing} +\end{document} +\endinput +%% +%% End of file `kvsetkeys-example.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf Binary files differindex dcb9b0b4165..492b9a91b62 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf Binary files differindex b22a2c85b43..1ea5f7696ae 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf Binary files differindex 78672aeb872..e238e4bd5ba 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf Binary files differindex d0dce1f53c5..a928a26daf3 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf Binary files differindex cda599bdeb5..1139d4f696b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf Binary files differindex 38992016289..c43a3c5bb08 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf Binary files differindex 13c634708fc..ad639842a2d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf Binary files differindex ca7225f1007..1aea944ac8a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf Binary files differindex 43d32b2af1a..3aca92c707b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf Binary files differindex e3e82c64b52..96ada6a2592 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf Binary files differindex c9bc995c634..b25b9598475 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf Binary files differindex 7b7444c40d6..988049dedf1 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf Binary files differindex c57632ff04c..2608ddb4c70 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf Binary files differindex 7d0e0ca6824..0337dd7c888 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf Binary files differindex bd47ec53f37..2a22cbecf6c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf Binary files differindex 8b26dba2e07..1a73e4f385f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf Binary files differindex ed6c5b356f1..88e22bd13af 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf diff --git a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx index e3827ac5674..b64a8c8cdae 100644 --- a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx @@ -16,7 +16,8 @@ % % This work consists of the main source file kvsetkeys.dtx % and the derived files -% kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv. +% kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv, +% kvsetkeys-example.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/kvsetkeys.dtx @@ -51,6 +52,7 @@ % Installation: % TDS:tex/generic/oberdiek/kvsetkeys.sty % TDS:doc/latex/oberdiek/kvsetkeys.pdf +% TDS:doc/latex/oberdiek/kvsetkeys-example.tex % TDS:source/latex/oberdiek/kvsetkeys.dtx % %<*ignore> @@ -66,7 +68,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: kvsetkeys 2006/03/06 v1.0 Key value parser with default handler support (HO)} +\Msg{* Package: kvsetkeys 2006/10/19 v1.1 Key value parser with default handler support (HO)} \Msg{************************************************************************} \keepsilent @@ -92,7 +94,8 @@ This Current Maintainer of this work is Heiko Oberdiek. This work consists of the main source file kvsetkeys.dtx and the derived files - kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv. + kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv, + kvsetkeys-example.tex. \endpreamble @@ -101,6 +104,8 @@ and the derived files \file{kvsetkeys.drv}{\from{kvsetkeys.dtx}{driver}}% \usedir{tex/generic/oberdiek}% \file{kvsetkeys.sty}{\from{kvsetkeys.dtx}{package}}% + \usedir{doc/latex/oberdiek}% + \file{kvsetkeys-example.tex}{\from{kvsetkeys.dtx}{example}}% } \obeyspaces @@ -126,7 +131,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{kvsetkeys.drv}% - [2006/03/06 v1.0 Key value parser with default handler support (HO)] + [2006/10/19 v1.1 Key value parser with default handler support (HO)] \documentclass{ltxdoc} \usepackage{holtxdoc} \begin{document} @@ -135,7 +140,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{580} +% \CheckSum{585} % % \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 @@ -156,7 +161,7 @@ and the derived files % \GetFileInfo{kvsetkeys.drv} % % \title{The \xpackage{kvsetkeys} package} -% \date{2006/03/06 v1.0} +% \date{2006/10/19 v1.1} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -166,7 +171,7 @@ and the derived files % of package \xpackage{keyval}'s \cs{setkeys}. It allows to specify % a handler that deals with unknown options. Active commas and equal % signs may be used (e.g. see \xpackage{babel}'s shorthands) and -% only one level of curly braces are removed from the values. +% only one level of curly braces is removed from the values. % \end{abstract} % % \tableofcontents @@ -275,10 +280,20 @@ and the derived files % fi % \end{quote} % -% \begin{declcs}{kv@set@family@handler}\,\M{family}\,\M{handler} +% \subsection{Default family handler} +% +% \cs{kv@processor@default} calls \meta{handler}, the default +% handler for the family, if the key does not exist in the family. +% The handler is called with two arguments, the key and the value. +% It can be defined with \cs{kv@set@family@hander}: +% +% \begin{declcs}{kv@set@family@handler}\,\M{family}\,\M{handler definition} % \end{declcs} -% This sets the handler \meta{handler} for the keyval family -% \meta{family}. +% This sets the default family handler for the keyval family +% \meta{family}. Inside \meta{handler definition} |#1| stands for +% the key and |#2| is the value. Also \cs{kv@key} and \cs{kv@value} +% can be used for the key and the value. If the value is not given, +% \cs{kv@value} has the meaning \cs{relax}. % % \subsection{Do it all} % @@ -291,6 +306,70 @@ and the derived files % \texttt{\{}\cs{kv@processor@default}\,\M{family}\texttt{\}} % \end{quote} % +% Thus you can replace \cs{setkeys} of package \xpackage{keyval} +% by the key value parser of this package: +% \begin{quote} +% |\renewcommand*{\setkeys}{\kvsetkeys}|\\ +% or\\ +% |\let\setkeys\kvsetkeys| +% \end{quote} +% +% \section{Example} +% +% The following example prints a short piece of HTML code using +% the tabbing environment for indenting purpose and a key value +% syntax for specifying the attributes of an HTML tag. +% The example illustrates the use of a default family handler. +% \begin{macrocode} +%<*example> +\documentclass{article} +\usepackage[T1]{fontenc} +\usepackage{kvsetkeys} +\usepackage{keyval} + +\makeatletter +\newcommand*{\tag}[2][]{% + % #1: attributes + % #2: tag name + \begingroup + \toks@={}% + \let\@endslash\@empty + \kvsetkeys{tag}{#1}% + \texttt{% + \textless #2\the\toks@\@endslash\textgreater + }% + \endgroup +} +\kv@set@family@handler{tag}{% + % #1: key + % #2: value + \toks@\expandafter{% + \the\toks@ + \space + #1=\string"#2\string"% + }% +} +\define@key{tag}{/}[]{% + \def\@endslash{/}% +} +\makeatother + +\begin{document} +\begin{tabbing} + \mbox{}\qquad\=\qquad\=\kill + \tag{html}\\ + \>\dots\\ + \>\tag[border=1]{table}\\ + \>\>\tag[width=200, span=3, /]{colgroup}\\ + \>\>\dots\\ + \>\tag{/table}\\ + \>\dots\\ + \tag{/html}\\ +\end{tabbing} +\end{document} +%</example> +% \end{macrocode} +% % \StopEventually{ % } % @@ -345,7 +424,7 @@ and the derived files \fi \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% - [2006/03/06 v1.0 Key value parser with default handler support (HO)] + [2006/10/19 v1.1 Key value parser with default handler support (HO)] % \end{macrocode} % % \begin{macrocode} @@ -651,8 +730,11 @@ and the derived files % % \begin{macro}{\kv@set@family@handler} % \begin{macrocode} -\def\kv@set@family@handler#1#{% - \expandafter\def\csname KVS@#1@handler\endcsname +\def\kv@set@family@handler#1{% + \KVS@set@family@handler{#1}\@nil +} +\def\KVS@set@family@handler#1\@nil#{% + \expandafter\def\csname KVS@#1@handler\endcsname##1##2% } % \end{macrocode} % \end{macro} @@ -748,6 +830,7 @@ and the derived files % \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}} % kvsetkeys.sty & tex/generic/oberdiek/kvsetkeys.sty\\ % kvsetkeys.pdf & doc/latex/oberdiek/kvsetkeys.pdf\\ +% kvsetkeys-example.tex & doc/latex/oberdiek/kvsetkeys-example.tex\\ % kvsetkeys.dtx & source/latex/oberdiek/kvsetkeys.dtx\\ % \end{tabular}^^A % }% @@ -830,6 +913,12 @@ and the derived files % \item % First version. % \end{Version} +% \begin{Version}{2006/10/19 v1.1} +% \item +% Fix of \cs{kv@set@family@handler}. +% \item +% Example added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index b3d80cc9e68..4a10914c6e3 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2006/09/29 +% 2006/10/19 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index e4dae70813d..bfa12e78fd2 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,7 +6,7 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{oberdiek@uni-freiburg.de} -\newcommand*{\Date}{2006/09/29} +\newcommand*{\Date}{2006/10/19} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -200,7 +200,7 @@ [\entrysep] \entry{kvoptions}{2006/08/22}{2.4}{Connects package keyval with \LaTeX{} options}% [\entrysep] -\entry{kvsetkeys}{2006/03/06}{1.0}{Key value parser with default handler support}% +\entry{kvsetkeys}{2006/10/19}{1.1}{Key value parser with default handler support}% [\entrysep] \entry{makerobust}{2006/03/18}{1.0}{Making a macro robust}% [\entrysep] @@ -487,7 +487,7 @@ Package \xpackage{kvsetkeys} provides \cs{kvsetkeys}, a variant of package \xpackage{keyval}'s \cs{setkeys}. It allows to specify a handler that deals with unknown options. Active commas and equal signs may be used (e.g. see \xpackage{babel}'s shorthands) and -only one level of curly braces are removed from the values. +only one level of curly braces is removed from the values. \end{abstract} \tocinclude{kvsetkeys} diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty index d76859fd885..2879dbc2154 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty @@ -24,7 +24,8 @@ %% %% This work consists of the main source file kvsetkeys.dtx %% and the derived files -%% kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv. +%% kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv, +%% kvsetkeys-example.tex. %% \begingroup \expandafter\let\expandafter\x\csname ver@kvsetkeys.sty\endcsname @@ -65,7 +66,7 @@ \fi \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% - [2006/03/06 v1.0 Key value parser with default handler support (HO)] + [2006/10/19 v1.1 Key value parser with default handler support (HO)] \expandafter\edef\csname KVS@endinput\endcsname{% \catcode39 \the\catcode39 % ' \catcode44 \the\catcode44 % , @@ -296,8 +297,11 @@ \fi \fi } -\def\kv@set@family@handler#1#{% - \expandafter\def\csname KVS@#1@handler\endcsname +\def\kv@set@family@handler#1{% + \KVS@set@family@handler{#1}\@nil +} +\def\KVS@set@family@handler#1\@nil#{% + \expandafter\def\csname KVS@#1@handler\endcsname##1##2% } \expandafter\ifx\csname MessageBreak\endcsname\relax \def\MessageBreak{^^J}% diff --git a/Master/texmf-dist/tpm/oberdiek.tpm b/Master/texmf-dist/tpm/oberdiek.tpm index 3f5e5d7ad02..ddc7979d558 100644 --- a/Master/texmf-dist/tpm/oberdiek.tpm +++ b/Master/texmf-dist/tpm/oberdiek.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/oberdiek.zip"> <TPM:Name>oberdiek</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/09/30 21:44:11</TPM:Date> + <TPM:Date>2006/10/19 16:51:50</TPM:Date> <TPM:Version></TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title>Packages written by Heiko Oberdiek</TPM:Title> @@ -11,7 +11,7 @@ <TPM:Author>Heiko Oberdiek</TPM:Author> <TPM:Size>8566799</TPM:Size> <TPM:Build/> - <TPM:RunFiles size="652822"> + <TPM:RunFiles size="652932"> texmf-dist/scripts/oberdiek/pdfatfi.pl texmf-dist/tex/generic/oberdiek/alphalph.sty texmf-dist/tex/generic/oberdiek/engord.sty @@ -104,7 +104,7 @@ texmf-dist/tex/latex/oberdiek/zref-xr.sty texmf-dist/tex/latex/oberdiek/zref.sty texmf-dist/tpm/oberdiek.tpm </TPM:RunFiles> - <TPM:DocFiles size="6603125"> + <TPM:DocFiles size="6613694"> texmf-dist/doc/latex/oberdiek/aliascnt.pdf texmf-dist/doc/latex/oberdiek/alphalph.pdf texmf-dist/doc/latex/oberdiek/attachfile2.pdf @@ -133,6 +133,7 @@ texmf-dist/doc/latex/oberdiek/inputenx-licrcmds.txt texmf-dist/doc/latex/oberdiek/inputenx-utf8enc.txt texmf-dist/doc/latex/oberdiek/inputenx.pdf texmf-dist/doc/latex/oberdiek/kvoptions.pdf +texmf-dist/doc/latex/oberdiek/kvsetkeys-example.tex texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf texmf-dist/doc/latex/oberdiek/makerobust-example.tex texmf-dist/doc/latex/oberdiek/makerobust.pdf @@ -159,7 +160,7 @@ texmf-dist/doc/latex/oberdiek/twoopt.pdf texmf-dist/doc/latex/oberdiek/zref-example.tex texmf-dist/doc/latex/oberdiek/zref.pdf </TPM:DocFiles> - <TPM:SourceFiles size="1310852"> + <TPM:SourceFiles size="1313217"> texmf-dist/source/latex/oberdiek/aliascnt.dtx texmf-dist/source/latex/oberdiek/alphalph.dtx texmf-dist/source/latex/oberdiek/attachfile2.dtx diff --git a/Master/texmf/lists/oberdiek b/Master/texmf/lists/oberdiek index 4a9cb08d13f..5c04c42bd93 100644 --- a/Master/texmf/lists/oberdiek +++ b/Master/texmf/lists/oberdiek @@ -26,6 +26,7 @@ texmf-dist/doc/latex/oberdiek/inputenx-licrcmds.txt texmf-dist/doc/latex/oberdiek/inputenx-utf8enc.txt texmf-dist/doc/latex/oberdiek/inputenx.pdf texmf-dist/doc/latex/oberdiek/kvoptions.pdf +texmf-dist/doc/latex/oberdiek/kvsetkeys-example.tex texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf texmf-dist/doc/latex/oberdiek/makerobust-example.tex texmf-dist/doc/latex/oberdiek/makerobust.pdf |