ltxdockit (20nov10)

git-svn-id: svn://tug.org/texlive/trunk@20499 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 102 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/latex/ltxdockit/README b/Master/texmf-dist/doc/latex/ltxdockit/README
index 753ade22708..086d9b86aa5 100644
--- a/Master/texmf-dist/doc/latex/ltxdockit/README
+++ b/Master/texmf-dist/doc/latex/ltxdockit/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.2a 2010/02/12 20:20:16 lehman stable $
+$Id: README,v 1.2b 2010/11/19 12:04:25 lehman stable $
 
 ABOUT
 
diff --git a/Master/texmf-dist/tex/latex/ltxdockit/btxdockit.sty b/Master/texmf-dist/tex/latex/ltxdockit/btxdockit.sty
index fe50f1c48f2..0c2bafd5fea 100644
--- a/Master/texmf-dist/tex/latex/ltxdockit/btxdockit.sty
+++ b/Master/texmf-dist/tex/latex/ltxdockit/btxdockit.sty
@@ -1,4 +1,4 @@
-% $Id: btxdockit.sty,v 1.2a 2010/02/12 20:20:16 lehman stable $
+% $Id: btxdockit.sty,v 1.2b 2010/11/19 12:04:25 lehman stable $
 %
 % Copyright (c) 2008-2010 Philipp Lehman.
 %
@@ -18,7 +18,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{btxdockit}
-[\ltd@rcsid $Id: btxdockit.sty,v 1.2a 2010/02/12 20:20:16 lehman stable $
+[\ltd@rcsid $Id: btxdockit.sty,v 1.2b 2010/11/19 12:04:25 lehman stable $
  BibTeX documentation kit]
 
 \RequirePackage{etoolbox}
diff --git a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cfg b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cfg
index ddc36789cc4..8e50d44cc39 100644
--- a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cfg
+++ b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cfg
@@ -1,10 +1,13 @@
-% $Id: ltxdockit.cfg,v 1.2a 2010/02/12 20:20:16 lehman stable $
+% $Id: ltxdockit.cfg,v 1.2b 2010/11/19 12:04:25 lehman stable $
 
 \ProvidesFile{ltxdockit.cfg}
-[\ltd@rcsid $Id: ltxdockit.cfg,v 1.2a 2010/02/12 20:20:16 lehman stable $
+[\ltd@rcsid $Id: ltxdockit.cfg,v 1.2b 2010/11/19 12:04:25 lehman stable $
  ltxdockit configuration (DFSG-free)]
 
+\RequirePackage[T1]{fontenc}
 \RequirePackage{lmodern}
+\RequirePackage{helvet}
+\RequirePackage{charter}
 
 \catcode`\"=\active
 \AtEndPreamble{%
@@ -20,9 +23,13 @@
 
 \newrobustcmd*{\tex}{TeX\xspace}
 \newrobustcmd*{\etex}{\mbox{e-TeX}\xspace}
-\newrobustcmd*{\xetex}{Xe\tex}
+\newrobustcmd*{\pdftex}{pdf\-\tex}
+\newrobustcmd*{\xetex}{Xe\-\tex}
+\newrobustcmd*{\luatex}{Lua\-\tex}
 \newrobustcmd*{\latex}{La\kern-0.07em TeX\xspace}
-\newrobustcmd*{\xelatex}{Xe\latex}
+\newrobustcmd*{\pdflatex}{pdf\-\latex}
+\newrobustcmd*{\xelatex}{Xe\-\latex}
+\newrobustcmd*{\lualatex}{Lua\-\latex}
 \newrobustcmd*{\bibtex}{Bib\kern-0.07em TeX\xspace}
 \newrobustcmd*{\lppl}{\latex Project Public License\xspace}
 \newrobustcmd*{\pdf}{\acr{PDF}\xspace}
@@ -69,6 +76,7 @@
 \renewcommand*{\verbatimfont}{\ttfamily}
 \renewcommand*{\displayverbfont}{\ttfamily}
 \renewcommand*{\marglistfont}{\spotcolor\sffamily\small}
+\renewcommand*{\margnotefont}{\sffamily\small}
 \renewcommand*{\optionlistfont}{\spotcolor\sffamily\displayverbfont}
 \renewcommand*{\ltxsyntaxfont}{\ttfamily}
 \renewcommand*{\ltxsyntaxlabelfont}{\spotcolor\displayverbfont}
diff --git a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cls b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cls
index b8217a02e7c..6fecae079cc 100644
--- a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cls
+++ b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.cls
@@ -1,4 +1,4 @@
-% $Id: ltxdockit.cls,v 1.2a 2010/02/12 20:20:16 lehman stable $
+% $Id: ltxdockit.cls,v 1.2b 2010/11/19 12:04:25 lehman stable $
 %
 % Copyright (c) 2008-2010 Philipp Lehman.
 %
@@ -18,7 +18,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltxdockit}
-[\ltd@rcsid $Id: ltxdockit.cls,v 1.2a 2010/02/12 20:20:16 lehman stable $
+[\ltd@rcsid $Id: ltxdockit.cls,v 1.2b 2010/11/19 12:04:25 lehman stable $
  LaTeX documentation kit]
 
 \input{ltxdockit.def}
diff --git a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.def b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.def
index 7cfeb769877..b5b0c430e13 100644
--- a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.def
+++ b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.def
@@ -1,7 +1,7 @@
-% $Id: ltxdockit.def,v 1.2a 2010/02/12 20:20:16 lehman stable $
+% $Id: ltxdockit.def,v 1.2b 2010/11/19 12:04:25 lehman stable $
 
 \ProvidesFile{ltxdockit.def}
-[\ltd@rcsid $Id: ltxdockit.def,v 1.2a 2010/02/12 20:20:16 lehman stable $
+[\ltd@rcsid $Id: ltxdockit.def,v 1.2b 2010/11/19 12:04:25 lehman stable $
  ltxdockit pre-configuration (DFSG-free)]
 
 \RequirePackage{etoolbox}
@@ -15,16 +15,17 @@
 
 \newcommand*{\AtBeginToc}{\g@addto@macro\@begintochook}
 \newcommand*{\AtEndToc}{\g@addto@macro\@endtochook}
-\newcommand*{\@begintochook}{}
-\newcommand*{\@endtochook}{}
 \@onlypreamble\AtBeginToc
 \@onlypreamble\AtEndToc
+\newcommand*{\@begintochook}{}
+\newcommand*{\@endtochook}{}
+
 \newcommand*{\AtBeginLot}{\g@addto@macro\@beginlothook}
 \newcommand*{\AtEndLot}{\g@addto@macro\@endlothook}
-\newcommand*{\@beginlothook}{}
-\newcommand*{\@endlothook}{}
 \@onlypreamble\AtBeginLot
 \@onlypreamble\AtEndLot
+\newcommand*{\@beginlothook}{}
+\newcommand*{\@endlothook}{}
 
 \pretocmd\@starttoc{\csuse{@begin#1hook}}{}{}
 \apptocmd\@starttoc{\csuse{@end#1hook}}{}{}
diff --git a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.sty b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.sty
index 374efea9d5d..ad17a1057fc 100644
--- a/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.sty
+++ b/Master/texmf-dist/tex/latex/ltxdockit/ltxdockit.sty
@@ -1,4 +1,4 @@
-% $Id: ltxdockit.sty,v 1.2a 2010/02/12 20:20:16 lehman stable $
+% $Id: ltxdockit.sty,v 1.2b 2010/11/19 12:04:25 lehman stable $
 %
 % Copyright (c) 2008-2010 Philipp Lehman.
 %
@@ -18,7 +18,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ltxdockit}
-[\ltd@rcsid $Id: ltxdockit.sty,v 1.2a 2010/02/12 20:20:16 lehman stable $
+[\ltd@rcsid $Id: ltxdockit.sty,v 1.2b 2010/11/19 12:04:25 lehman stable $
  LaTeX documentation kit]
 
 \RequirePackage{etoolbox}
@@ -41,6 +41,7 @@
   \setlength{\marglistsep}{10pt}}
 
 \newcommand*{\marglistfont}{\bfseries}
+\newcommand*{\margnotefont}{}
 \newcommand*{\optionlistfont}{\bfseries}
 \newcommand*{\ltxsyntaxfont}{\ttfamily}
 \newcommand*{\ltxsyntaxlabelfont}{\bfseries}
@@ -71,10 +72,12 @@
 \newrobustcmd*{\len}[1]{\mbox{\verbatimfont\textbackslash#1}}
 \newrobustcmd*{\cnt}[1]{\mbox{\verbatimfont#1}}
 \newrobustcmd*{\prm}[1]{%
-  \mbox{%
-    \ensuremath\langle
-    \normalfont\textit{#1}%
-    \ensuremath\rangle}}
+  \ifblank{#1}
+    {}
+    {\mbox{%
+       \ensuremath\langle
+       \normalfont\textit{#1}%
+       \ensuremath\rangle}}}
 \newrobustcmd*{\mprm}[1]{%
   \mbox{%
     {\verbatimfont\{}%
@@ -95,12 +98,12 @@
 \newrobustcmd*{\file}[1]{\mbox{\verbatimfont#1}}
 \newrobustcmd*{\sty}[1]{\mbox{\verbatimfont#1}}
 \newrobustcmd*{\bin}[1]{\mbox{\verbatimfont#1}}
-\newrobustcmd*{\acr}[1]{%
+\newrobustcmd*{\acr}[1]{\mbox{%
   \ifx\f@family\rmdefault
     \textsc{\MakeLowercase{#1}}%
   \else
     #1%
-  \fi}
+  \fi}}
 \csdef{*}{\textasteriskcentered}
 \newrobustcmd*{\keyval}{%
   \begingroup\verbatimfont
@@ -384,6 +387,7 @@
      \setlength{\leftmargin}{0pt}%
      \renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
    \ltd@optionlist
+   \let\ltd@option@i\ltd@option@ii
    \def\legitem##1{\item[##1]\item\relax}}
   {\endlist
    \ltd@pdfrestore}
@@ -392,6 +396,7 @@
   \let\optitem\ltd@ol@optitem
   \let\varitem\ltd@ol@varitem
   \let\valitem\ltd@ol@valitem
+  \let\choitem\ltd@ol@choitem
   \let\boolitem\ltd@ol@boolitem
   \let\intitem\ltd@ol@intitem
   \let\legitem\ltd@ol@legitem}
@@ -411,12 +416,15 @@
     {\ltd@option{#2}{#2}{\prm{#3}}{}}
     {\ltd@option{#2}{#2}{\prm{#3}}{\ltd@textverb{#1}}}}%
 
+\newcommand*{\ltd@ol@choitem}[3][]{%
+  \ifblank{#1}
+    {\ltd@option{#2}{#2}{\ltd@verblist{#3}}{}}
+    {\ltd@option{#2}{#2}{\ltd@verblist{#3}}{\ltd@textverb{#1}}}}%
+
 \newcommand*{\ltd@ol@boolitem}[2][]{%
   \ifblank{#1}
-    {\ltd@option{#2}{#2}{\ltd@textverb{true},
-                      \ltd@textverb{false}}{}}
-    {\ltd@option{#2}{#2}{\ltd@textverb{true},
-                      \ltd@textverb{false}}{\ltd@textverb{#1}}}}%
+    {\ltd@option{#2}{#2}{\ltd@verblist{true,false}}{}}
+    {\ltd@option{#2}{#2}{\ltd@verblist{true,false}}{\ltd@textverb{#1}}}}%
 
 \newcommand*{\ltd@ol@intitem}[2][]{%
   \ifblank{#1}
@@ -427,19 +435,68 @@
   \item[#1\hspace{\marglistsep}]%
   \ltd@pdfbookmark{#1}{#1}}%
 
-\def\ltd@textverb#1{{\displayverbfont#1}}%
+\def\ltd@textverb#1{{\displayverbfont#1}}
+
+\def\ltd@verblist#1{%
+  \begingroup
+  \let\@tempa\@empty
+  \def\do##1{\@tempa\ltd@textverb{##1}\def\@tempa{, }}%
+  \docsvlist{#1}%
+  \endgroup}
 
 \def\ltd@option#1#2#3#4{%
+  \@ifnextchar[%]
+    {\ltd@option@i{#1}{#2}{#3}{#4}}
+    {\ltd@option@i{#1}{#2}{#3}{#4}[]}}
+
+\def\ltd@option@i#1#2#3#4[#5]{%
   \item[#2]%
   \ltd@pdfbookmark{#1}{#1}%
-  \ltd@textverb{=}{#3}%
-  \ifblank{#4}{}{\hfill default: #4}%
-  \par\nobreak\vspace{\itemsep}}
-
-\newenvironment*{valuelist}
+  \begingroup\raggedright
+  \ltd@textverb{=}%
+  \settowidth\@tempdimb{\ltd@textverb{=}}%
+  \@tempdima=\dimexpr\linewidth-\@tempdimb\relax
+  \ifblank{#4}
+    {}
+    {\settowidth\@tempdimb{default: #4}%
+     \@tempdima=\dimexpr\@tempdima-\@tempdimb-2em\relax}%
+  \parbox[t]{\@tempdima}{\raggedright #3}%
+  \ifblank{#4}
+    {}
+    {\hfill default:~#4}%
+  \ifblank{#5}
+    {}
+    {\marginpar{\margnotefont #5}}%
+  \par\endgroup
+  \nobreak\vspace{\itemsep}}
+
+\def\ltd@option@ii#1#2#3#4[#5]{%
+  \item[#2]%
+  \ltd@pdfbookmark{#1}{#1}%
+  \begingroup\raggedright
+  \ltd@textverb{=}%
+  \settowidth\@tempdimb{{\optionlistfont#2}\ltd@textverb{=}}%
+  \@tempdima=\dimexpr\linewidth-\@tempdimb\relax
+  \ifblank{#4}
+    {}
+    {\settowidth\@tempdimb{default: #4}%
+     \@tempdima=\dimexpr\@tempdima-\@tempdimb-2em\relax}%
+  \parbox[t]{\@tempdima}{\raggedright #3}%
+  \ifblank{#4}
+    {}
+    {\hfill default:~#4}%
+  \ifblank{#5}
+    {}
+    {\marginpar{\margnotefont #5}}%
+  \par\endgroup
+  \nobreak\vspace{\itemsep}}
+
+\newenvironment*{valuelist}[1][]
   {\list{}{%
-     \setlength{\labelwidth}{5em}%
-     \setlength{\labelsep}{0.5em}%
+     \ifblank{#1}
+       {\setlength{\labelwidth}{5em}}
+       {\settowidth{\labelwidth}{\displayverbfont#1}}%
+     \setlength{\labelsep}{1em}%
      \setlength{\leftmargin}{\labelwidth}%
      \addtolength{\leftmargin}{\labelsep}%
      \setlength{\itemsep}{0pt}%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 0129cad91a3..f1197e6466e 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -119,6 +119,7 @@ $Master = "$mydir/../..";
  'bgreek',	"&MAKEcopy",
  'bib2ml',	"die 'skipping, no self-locate?, etc.'",
  'biber',	"die 'skipping, arch-dependent perl, etc.'",
+ 'biblatex-contrib',	"die 'skipping, use subdir'",
  'biblatex-philosophy', "&MAKEflatten",
  'bibtool',	"die 'skipping, requires compilation'",
  'bibtools',	"die 'skipping, ten year old scripts, will await users'",