ydoc (13aug11)

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

8 files changed, 110 insertions, 203 deletions

diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty
index 2d03623c619..a62e7ba0c1e 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty
@@ -4,34 +4,13 @@
 %%
 %% The original source files were:
 %%
-%% ydoc.dtx  (with options: `code')
+%% ydoc.dtx  (with options: `ydoc-code.sty')
 %% 
-%%
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
-%% WWW: http://latex.scharrer-online.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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ydoc.dtx and ydoc.ins
-%% and the derived file ydoc.cls, ydoc.sty, ydoc-code.sty,
-%% ydoc-expl.sty and ydoc-desc.sty.
-%%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\RequirePackage{svn-prov}[2010/04/03]
-\ProvidesPackageSVN
-    {$Id: ydoc_code_sty.dtx 2339 2011-03-18 20:18:09Z martin $}
-    [v0.5alpha]
-    [ydoc package to document macro code]
+\ProvidesPackage{ydoc-code}[%
+    2011/08/11
+    v0.5alpha
+    ydoc package to document macro code]
 \RequirePackage{hyperref}
 \hypersetup{colorlinks=true,pdfborder=0 0 0,pdfborderstyle={}}
 \IfFileExists{needspace.sty}{%
@@ -179,6 +158,13 @@
     {}%
 }
 \def\endmacro{}
+\def\key#1#2{%
+  \PrintMacroImpl{KV@#1@#2}%
+  \@ifnextchar[%]
+    {\macro@impl@args}%
+    {}%
+}
+\def\endkey{}
 \def\environment#1{%
   \PrintEnvImplName{#1}%
   \@ifnextchar[%]
@@ -186,6 +172,14 @@
     {}%
 }
 \def\endenvironment{}
+\def\style#1{%
+  \PrintStyleImplName{#1}%
+  \@ifnextchar[%]
+    {\macro@impl@args}%
+    {}%
+}
+\def\endstyle{}
+\def\PrintStyleImplName{\PrintEnvImplName}
 \def\PrintMacroImpl#1{%
   \par\bigskip\noindent
   \Needspace*{3\baselineskip}%
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
index a9e69681788..8419a02a597 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
@@ -4,34 +4,13 @@
 %%
 %% The original source files were:
 %%
-%% ydoc.dtx  (with options: `desc')
+%% ydoc.dtx  (with options: `ydoc-desc.sty')
 %% 
-%%
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
-%% WWW: http://latex.scharrer-online.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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ydoc.dtx and ydoc.ins
-%% and the derived file ydoc.cls, ydoc.sty, ydoc-code.sty,
-%% ydoc-expl.sty and ydoc-desc.sty.
-%%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\RequirePackage{svn-prov}[2010/04/03]
-\ProvidesPackageSVN[ydoc-desc]
-    {$Id: ydoc_desc_sty.dtx 2369 2011-03-20 00:04:45Z martin $}
-    [v0.5alpha]
-    [ydoc package to describe macros, environments, options etc.]
+\ProvidesPackage{ydoc-desc}[%
+    2011/08/11
+    v0.5alpha
+    ydoc package to describe macros, environments, options etc.]
 \IfFileExists{needspace.sty}{%
     \RequirePackage{needspace}
 }{%
@@ -41,6 +20,7 @@
 \RequirePackage{etoolbox}
 \RequirePackage{xcolor}
 \definecolor{macrodesc}{rgb}{0,0.2,0.6}
+\definecolor{keydesc}{rgb}{0,0.4,0.9}
 \definecolor{macroimpl}{rgb}{0,0.1,0.3}
 \definecolor{meta}{rgb}{0,0.25,0.75}
 \definecolor{scriptcolor}{rgb}{0.2,0.6,0.2}
@@ -130,7 +110,9 @@
 \definecolor{opt}{rgb}{0.5,0.16666,0}
 \newrobustcmd*\cs[1]{\texttt{\textbackslash #1}}
 \newrobustcmd*\cmd[1]{\texttt{{\escapechar=92\string#1}}}
+\newrobustcmd*\Key[1]{\PrintKeyName{#1}\MacroArgs}
 \def\macrodescstyle{\ttfamily\bfseries\color{macrodesc}}
+\def\keydescstyle{\ttfamily\bfseries\color{keydesc}}
 \def\macroargsstyle{\ttfamily}
 \def\envcodestyle{\ttfamily}
 \def\verbstyle{\verbatim@font}
@@ -357,6 +339,14 @@
   \macroargsstyle
   \read@Macro@arg~%
 }
+\def\DescribeKey{%
+  \DescribeKeys
+  \let\DescribeKeys\y@egroup
+  \optionalon
+  \def\after@Macro@args{\endDescribeKeys}%
+  \begingroup\makeatletter
+  \Describe@Macro
+}
 \def\Describe@Macro#1{%
   \endgroup
   \edef\name{\expandafter\@gobble\string#1}%
@@ -397,6 +387,7 @@
 }
 \define@Macro@handler\AlsoMacro{}
 \define@Macro@handler\DescribeMacro{}
+\define@Macro@handler\DescribeKey{}
 \newcommand*\MacroArgs{%
   \begingroup
   \def\end@Macro@args{\endgroup\xspace}%
@@ -416,6 +407,19 @@
   \PrintMacros
   \endgroup
 }
+\def\DescribeKeys{%
+  \begingroup
+  \let\PrintMacroName\PrintKeyName
+  \let\Key\@Macro
+  \parindent=0pt\relax
+  \setbox\descbox\vbox\y@bgroup
+}
+\def\endDescribeKeys{%
+  \y@egroup
+  \PrintKeys
+  \endgroup
+}
+\def\PrintKeys{\PrintMacros}
 \def\DescribeMacrosTabcolsep{\tabcolsep}
 \def\DescribeMacrosTab{%
   \DescribeMacros
@@ -520,6 +524,10 @@
    \escapechar\m@ne
    \string#1\strut}}%
 }
+\def\PrintKeyName#1{%
+  {\keydescstyle{\strut
+   #1\strut}}%
+}
 \let\PrintLengthName\PrintMacroName
 \def\PrintEnvName#1#2{%
   \strut
@@ -531,7 +539,7 @@
   \par\vspace\beforedescskip
   \begingroup
   \sbox\@tempboxa{\descframe{\usebox{\descbox}}}%
-  \Needspace*{\dimexpr\ht\@tempboxa+2\baselineskip\relax}%
+  \Needspace*{\dimexpr\ht\@tempboxa+3\baselineskip\relax}%
   \par\noindent
   \ifdim\wd\@tempboxa>\dimexpr\linewidth-2\descindent\relax
     \makebox[\linewidth][c]{\usebox\@tempboxa}%
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty
index b9dcc943a96..9164dbd36aa 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty
@@ -4,34 +4,13 @@
 %%
 %% The original source files were:
 %%
-%% ydoc.dtx  (with options: `doc')
+%% ydoc.dtx  (with options: `ydoc-doc.sty')
 %% 
-%%
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
-%% WWW: http://latex.scharrer-online.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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ydoc.dtx and ydoc.ins
-%% and the derived file ydoc.cls, ydoc.sty, ydoc-code.sty,
-%% ydoc-expl.sty and ydoc-desc.sty.
-%%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\RequirePackage{svn-prov}[2010/04/03]
-\ProvidesPackageSVN[ydoc]
-    {$Id: ydoc_doc_sty.dtx 2378 2011-03-20 20:34:27Z martin $}
-    [v0.5alpha]
-    [ydoc package to provide 'doc' macros]
+\ProvidesPackage{ydoc-doc}[%
+    2011/08/11
+    v0.5alpha
+    ydoc package to provide 'doc' macros]
 \newcount\ydoc@bslashcnt
 \def\ydoc@countbslashes{%
   \begingroup
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty
index ff5f245a205..70781dba415 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty
@@ -4,45 +4,23 @@
 %%
 %% The original source files were:
 %%
-%% ydoc.dtx  (with options: `expl')
+%% ydoc.dtx  (with options: `ydoc-expl.sty')
 %% 
-%%
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
-%% WWW: http://latex.scharrer-online.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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ydoc.dtx and ydoc.ins
-%% and the derived file ydoc.cls, ydoc.sty, ydoc-code.sty,
-%% ydoc-expl.sty and ydoc-desc.sty.
-%%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\RequirePackage{svn-prov}[2010/04/03]
-\ProvidesPackageSVN[ydoc]
-    {$Id: ydoc_expl_sty.dtx 2332 2011-03-17 17:12:35Z martin $}
-    [v0.5alpha]
-    [ydoc package to insert live examples of LaTeX code]
+\ProvidesPackage{ydoc-expl}[%
+    2011/08/11
+    v0.5alpha
+    ydoc package to insert live examples of LaTeX code]
 \RequirePackage{listings}
 \lst@RequireAspects{writefile}
 \def\ydoc@exafile{\jobname.exa}
-\def\exampleprintsettings{numbers=left,numberstyle=\tiny\color{gray}\sffamily,numbersep=5pt}%
+\lstdefinestyle{examplecode}{numbers=left,firstnumber=1,numberstyle=\tiny\color{gray}\sffamily,numbersep=5pt}%
+\lstdefinestyle{exampleextract}{gobble=4}%
 \newbox\examplecodebox
 \newbox\exampleresultbox
 \def\BoxExample{%
   \setbox\examplecodebox\hbox{\color@setgroup
-    \expandafter\expandafter\expandafter\lstinputlisting
-    \expandafter\expandafter\expandafter[%
-    \expandafter\exampleprintsettings\expandafter,\thisexampleprintsettings]%
+    \lstinputlisting[style=examplecode,style=thisexampleprint]%
     {\ydoc@exafile}%
   \unskip\color@endgroup}%
   \setbox\exampleresultbox\hbox{\color@setgroup
@@ -73,10 +51,9 @@
   \fi
   \endgroup
 }
-\def\examplecodesettings{gobble=4}
 \lstnewenvironment{examplecode}[1][]{%
-  \def\thisexampleprintsettings{#1}%
-  \expandafter\lstset\expandafter{\examplecodesettings,#1}%
+  \lstdefinestyle{thisexampleprint}{#1}%
+  \lstset{style=exampleextract,#1}%
   \setbox\@tempboxa\hbox\bgroup
   \lst@BeginWriteFile{\ydoc@exafile}%
 }
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg b/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg
index 38b4dae7ae8..2820d97184e 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg
@@ -4,46 +4,23 @@
 %%
 %% The original source files were:
 %%
-%% ydoc.dtx  (with options: `cfg')
+%% ydoc.dtx  (with options: `ydoc.cfg')
 %% 
-%%
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
-%% WWW: http://latex.scharrer-online.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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ydoc.dtx and ydoc.ins
-%% and the derived file ydoc.cls, ydoc.sty, ydoc-code.sty,
-%% ydoc-expl.sty and ydoc-desc.sty.
-%%
 %% Please delete the following line on manual changes:
-\ProvidesFileSVN[ydoc.cfg]{$Id: ydoc_cfg.dtx 2338 2011-03-18 01:14:34Z martin $}
-    [v0.5alpha]
-  [Default config file for ydoc]
+\ProvidesFile{ydoc.cfg}[%
+    2011/08/11
+    v0.5alpha
+   Default config file for ydoc]
 \usepackage[T1]{fontenc}
-\IfFileExists{libertine.sty}{%
-    \usepackage{libertine}
-    \begingroup
-    \setbox0\hbox{\it g\/}
-    \setbox1\hbox{\it g}
-    \ifnum\wd0>\wd1\else
-        \gdef\/{\kern 0.8864pt}
-    \fi
-    \endgroup
+\IfFileExists{fourier.sty}{%
+    \usepackage{fourier}
 }{}
-\IfFileExists{lmodern.sty}{%
-    %\usepackage{lmodern}
-    \renewcommand{\ttdefault}{lmtt}
+\IfFileExists{lmodern.sty}{
+    \IfFileExists{fourier.sty}{
+        \renewcommand{\ttdefault}{lmtt}
+    }{
+        \usepackage{lmodern}
+    }
 }{}
 \urlstyle{sf}
 \usepackage{ifpdf}
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls
index 0861fe49aaa..6ac1b821f2a 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls
@@ -4,34 +4,13 @@
 %%
 %% The original source files were:
 %%
-%% ydoc.dtx  (with options: `class')
+%% ydoc.dtx  (with options: `ydoc.cls')
 %% 
-%%
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
-%% WWW: http://latex.scharrer-online.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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ydoc.dtx and ydoc.ins
-%% and the derived file ydoc.cls, ydoc.sty, ydoc-code.sty,
-%% ydoc-expl.sty and ydoc-desc.sty.
-%%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\RequirePackage{svn-prov}[2010/04/03]
-\ProvidesClassSVN
-    {$Id: ydoc_cls.dtx 2336 2011-03-18 00:56:07Z martin $}
-    [v0.5alpha]
-    [ydoc class: document LaTeX class and packages]
+\ProvidesClass{ydoc}[%
+    2011/08/11
+    v0.5alpha
+    ydoc class: document LaTeX class and packages]
 \PassOptionsToClass{a4paper}{article}
 \DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{article}}
 \ProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty
index 9be7a39ce00..aaa166c3072 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty
@@ -4,34 +4,13 @@
 %%
 %% The original source files were:
 %%
-%% ydoc.dtx  (with options: `package')
+%% ydoc.dtx  (with options: `ydoc.sty')
 %% 
-%%
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
-%% WWW: http://latex.scharrer-online.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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ydoc.dtx and ydoc.ins
-%% and the derived file ydoc.cls, ydoc.sty, ydoc-code.sty,
-%% ydoc-expl.sty and ydoc-desc.sty.
-%%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\RequirePackage{svn-prov}[2010/04/03]
-\ProvidesPackageSVN[ydoc]
-    {$Id: ydoc_sty.dtx 2332 2011-03-17 17:12:35Z martin $}
-    [v0.5alpha]
-    [ydoc package: document LaTeX class and packages]
+\ProvidesPackage{ydoc}[%
+    2011/08/11
+    v0.5alpha
+    ydoc package: document LaTeX class and packages]
 \RequirePackage{svn-prov}[2010/04/03]
 \RequirePackage{ydoc-code}
 \RequirePackage{ydoc-expl}
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex b/Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex
index 25ec2c5e63f..358db8ae451 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex
+++ b/Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex
@@ -1,4 +1,17 @@
-%&pdflatex
+%%
+%% This is file `ydocstrip.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ydoc.dtx  (with options: `ydocstrip.tex')
+%% 
+\expandafter\ifx\csname ydocstripversion\endcsname\relax\else
+    \noindent
+\fi
+
+\chardef\ydocstripversion=1
+
 \input docstrip
 
 \def\checkOption<#1{%
@@ -50,7 +63,6 @@
     \fi
 }}
 
-
 \def\valueOption !#1>#2\endLine{%
     \begingroup
     \expandafter\let\expandafter\var\csname ydocstrip@var@#1\endcsname
@@ -67,4 +79,6 @@
     \endgroup
 }
 
-
+\endinput
+%%
+%% End of file `ydocstrip.tex'.