From b2ddfab321304389582ff4e049ef73f818d12628 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Feb 2011 00:16:15 +0000 Subject: ydoc (17feb11) git-svn-id: svn://tug.org/texlive/trunk@21443 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty | 2 +- Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty | 32 +++++++++++++++++++++++++- Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty | 2 +- Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty | 2 +- Master/texmf-dist/tex/latex/ydoc/ydoc.cls | 2 +- Master/texmf-dist/tex/latex/ydoc/ydoc.sty | 2 +- 6 files changed, 36 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ydoc') diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty index 4034d1fc43d..dbac15c6a3b 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackageSVN [ydoc-code] - {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $} + {$Id: ydoc.dtx 2163 2011-02-16 17:19:27Z martin $} [v0.4alpha] [ydoc package to document macro code] \RequirePackage{hyperref} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty index 607efc48538..43d9be9330c 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty @@ -29,11 +29,12 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackageSVN [ydoc-desc] - {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $} + {$Id: ydoc.dtx 2163 2011-02-16 17:19:27Z martin $} [v0.4alpha] [ydoc package to describe macros, environments, options etc.] \RequirePackage{hyperref} \hypersetup{colorlinks=true,pdfborder=0 0 0,pdfborderstyle={}} +\RequirePackage{shortvrb} \RequirePackage{xcolor} \definecolor{macrodesc}{rgb}{0.0,0.0,0.8} \definecolor{macroimpl}{rgb}{0.0,0.0,0.4} @@ -237,9 +238,29 @@ \hbox\y@bgroup \@ifundefined{href@impl@\name}{}{\hyperlink{impl:\name}}% {\hypertarget{desc:\name}{\PrintMacroName{#1}}}% + \ydoc@macrocatcodes \macroargsstyle \read@Macro@arg } +\def\ydoc@macrocatcodes{% + \ydoc@short@AlsoMacro +} +\newcommand*\MakeShortMacroArgs{% + \@ifstar + {\@MakeShortMacroArgs\Macro}% + {\@MakeShortMacroArgs\MacroArgs}% +} +\def\@MakeShortMacroArgs#1#2{% + \MakeShortVerb{#2} + \catcode`#2\active + \begingroup + \catcode`\~\active + \lccode`\~`#2\relax + \lowercase{\endgroup\gdef~{\bgroup\let~\egroup#1}}% +} +\newcommand*\DeleteShortMacroArgs[1]{% + \DeleteShortVerb{#1}% +} \newcommand*\Macro{\MacroArgs\AlsoMacro} \def\@Macro{% \begingroup\makeatletter @@ -254,9 +275,17 @@ \PrintMacroName{#1}% \read@Macro@arg } +\begingroup +\catcode`\|\active +\gdef\ydoc@short@AlsoMacro{% + \catcode`\|\active + \let|\AlsoMacro +} +\endgroup \newcommand*\MacroArgs{% \begingroup \def\end@Macro@args{\endgroup\xspace}% + \ydoc@macrocatcodes \macroargsstyle \read@Macro@arg } @@ -338,6 +367,7 @@ \let\PrintEnv\PrintSubEnv \hbox\y@bgroup \PrintEnvName{\begin}{\DescribeEnv@name}% + \ydoc@macrocatcodes \macroargsstyle \read@Macro@arg } diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty index aae0b73166f..ba8407ddd98 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackageSVN [ydoc-doc] - {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $} + {$Id: ydoc.dtx 2163 2011-02-16 17:19:27Z martin $} [v0.4alpha] [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 cdb13c65bf7..25f45d7ed7d 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackageSVN [ydoc-expl] - {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $} + {$Id: ydoc.dtx 2163 2011-02-16 17:19:27Z martin $} [v0.4alpha] [ydoc package to insert live examples of LaTeX code] \RequirePackage{listings} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls index 97223c97fbf..a800783768c 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls @@ -27,7 +27,7 @@ %% \RequirePackage{svn-prov}[2010/04/03] \ProvidesClassSVN - {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $} + {$Id: ydoc.dtx 2163 2011-02-16 17:19:27Z martin $} [v0.4alpha] [ydoc class: document LaTeX class and packages] \LoadClassWithOptions{article} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty index 2b1cca878b2..3a30527ef8d 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty @@ -28,7 +28,7 @@ \RequirePackage{svn-prov}[2010/04/03] \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackageSVN - {$Id: ydoc.dtx 2073 2011-01-26 11:25:50Z martin $} + {$Id: ydoc.dtx 2163 2011-02-16 17:19:27Z martin $} [v0.4alpha] [ydoc package: document LaTeX class and packages] \RequirePackage{ydoc-code} -- cgit v1.2.3