From 0dda076376f317c796a6a40d5006ef05cc7c031b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 May 2012 00:40:56 +0000 Subject: ydoc (3may12) git-svn-id: svn://tug.org/texlive/trunk@26202 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty | 10 +++++----- Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty | 18 ++++++++++++------ Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty | 2 +- Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty | 24 +++++++++++++++++++++--- Master/texmf-dist/tex/latex/ydoc/ydoc.cfg | 2 +- Master/texmf-dist/tex/latex/ydoc/ydoc.cls | 2 +- Master/texmf-dist/tex/latex/ydoc/ydoc.sty | 2 +- 7 files changed, 42 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty index 723c8e8aff4..77dead7767d 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty @@ -8,7 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-code}[% - 2011/11/19 + 2012/05/03 v0.6alpha ydoc package to document macro code] \RequirePackage{hyperref} @@ -113,15 +113,15 @@ \lstinputlisting{\ydocfname}% \endgroup } -\def\ydoclistingssettings{% - \lstset{% +\lstdefinestyle{ydoccode}{% language=[latex]tex,basicstyle=\ttfamily, numbers=left,numberstyle=\tiny\color{gray},firstnumber=last, breaklines,prebreak={\mbox{\tiny$\swarrow$}}, commentstyle=\color{black!60}, - }% +}% +\def\ydoclistingssettings{% + \lstset{style=ydoccode}% } -\ydoclistingssettings \def\macro@impl@args[#1]{% \begingroup \parindent=10pt\relax diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty index 7b27eaf1841..77f039ff923 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty @@ -8,7 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-desc}[% - 2011/11/19 + 2012/05/03 v0.6alpha ydoc package to describe macros, environments, options etc.] \IfFileExists{needspace.sty}{% @@ -19,6 +19,9 @@ \RequirePackage{shortvrb} \RequirePackage{etoolbox} \RequirePackage{xcolor} +\expandafter\def\csname\string\color@none\endcsname{% + \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} @@ -102,11 +105,11 @@ \newcommand*\envstyle[1]{\texttt{\textcolor{env}{#1}}} \newcommand*\optstyle[1]{\textsf{\textcolor{opt}{#1}}} \newcommand*\filestyle[1]{\texttt{\textcolor{file}{#1}}} -\colorlet{cls}{black} -\colorlet{lib}{black} -\colorlet{env}{black} -\colorlet{file}{black} -\colorlet{pkg}{black} +\colorlet{cls}{none} +\colorlet{lib}{none} +\colorlet{env}{none} +\colorlet{file}{none} +\colorlet{pkg}{none} \definecolor{opt}{rgb}{0.5,0.16666,0} \newrobustcmd*\cs[1]{\texttt{\textbackslash #1}} \newrobustcmd*\cmd[1]{\texttt{{\escapechar=92\string#1}}} @@ -276,6 +279,9 @@ \define@Macro@handler**{% \sarg\read@Macro@arg } +\define@Macro@handler{=}={% + =\read@Macro@arg +} \define@Macro@handler{'}'{% \begingroup \let\do\@makeother diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty index d9320425f40..ec153742593 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty @@ -8,7 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-doc}[% - 2011/11/19 + 2012/05/03 v0.6alpha ydoc package to provide 'doc' macros] \newcount\ydoc@bslashcnt diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty index 3115370a579..257cc758ff8 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty @@ -8,13 +8,30 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-expl}[% - 2011/11/19 + 2012/05/03 v0.6alpha ydoc package to insert live examples of LaTeX code] \RequirePackage{listings} \lst@RequireAspects{writefile} \def\ydoc@exafile{\jobname.exa} -\lstdefinestyle{examplecode}{numbers=left,firstnumber=1,numberstyle=\tiny\color{gray}\sffamily,numbersep=5pt}% +\lstdefinestyle{examplecode}{% + language=[latex]tex, + basicstyle=\ttfamily, + columns=fullflexible, + numbers=left, + firstnumber=1, + numberstyle=\tiny\color{gray}\sffamily, + numbersep=5pt, + breaklines,prebreak={\mbox{\tiny$\swarrow$}}, + commentstyle=\color{black!60}, +}% +\lstdefinestyle{exampleresult}{% + firstnumber=1, + gobble=0, + basicstyle=\ttfamily, + columns=fullflexible, + commentstyle=\color{black!60}, +} \lstdefinestyle{exampleextract}{gobble=4}% \newbox\examplecodebox \newbox\exampleresultbox @@ -24,6 +41,7 @@ {\ydoc@exafile}% \unskip\color@endgroup}% \setbox\exampleresultbox\hbox{\color@setgroup + \lstset{style=exampleresult}% \@@input\ydoc@exafile\relax \unskip\color@endgroup}% } @@ -53,8 +71,8 @@ } \lstnewenvironment{examplecode}[1][]{% \lstdefinestyle{thisexampleprint}{#1}% - \lstset{style=exampleextract,#1}% \setbox\@tempboxa\hbox\bgroup + \lstset{style=exampleextract,#1}% \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 049f0f41132..56b98ace15f 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg @@ -8,7 +8,7 @@ %% %% Please delete the following line on manual changes: \ProvidesFile{ydoc.cfg}[% - 2011/11/19 + 2012/05/03 v0.6alpha Default config file for ydoc] \usepackage[T1]{fontenc} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls index a2bc248db9f..f10f440395e 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls @@ -8,7 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ydoc}[% - 2011/11/19 + 2012/05/03 v0.6alpha ydoc class: document LaTeX class and packages] \PassOptionsToClass{a4paper}{article} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty index 6a3b3e016db..b888036fe95 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty @@ -8,7 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc}[% - 2011/11/19 + 2012/05/03 v0.6alpha ydoc package: document LaTeX class and packages] \RequirePackage{svn-prov}[2010/04/03] -- cgit v1.2.3