summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-11 00:40:15 +0000
committerKarl Berry <karl@freefriends.org>2011-01-11 00:40:15 +0000
commita91307c2f17b5b11a02a758bae9548f24ea3e844 (patch)
tree124f70c8668c3f03d0d467b1e87fe7c8bfaec399 /Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
parent69b48db5779580145aee8c957250d4556a2c5d91 (diff)
ydoc (10jan11)
git-svn-id: svn://tug.org/texlive/trunk@21019 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty')
-rw-r--r--Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty24
1 files changed, 8 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
index 6fe2fb5a857..99b00e20a07 100644
--- a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
+++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty
@@ -29,8 +29,8 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackageSVN
[ydoc-desc]
- {$Id: ydoc.dtx 2004 2011-01-03 22:51:32Z martin $}
- [v0.3alpha]
+ {$Id: ydoc.dtx 2035 2011-01-09 17:22:24Z martin $}
+ [v0.4alpha]
[ydoc package to describe macros, environments, options etc.]
\RequirePackage{hyperref}
\hypersetup{colorlinks=true,pdfborder=0 0 0,pdfborderstyle={}}
@@ -47,15 +47,6 @@
{\metastyle{#1\/}}%
\ensuremath\rangle
}
-\def\@meta#1{%
- \@ifnextchar<%
- {\is@meta}%
- {}%
- #1%
-}
-\def\is@meta<#1>{%
- \meta{#1}%
-}
\def\marg#1{\@marg{<#1>}}
\def\oarg#1{\@oarg{<#1>}}
\def\parg#1{\@parg{<#1>}}
@@ -63,28 +54,28 @@
\def\@marg#1{%
{\margstyle{%
{\ttfamily\braceleft}%
- \@meta{#1}%
+ {\def\end@Macro@args{}\read@Macro@arg#1}%
{\ttfamily\braceright}%
}}%
}
\def\@oarg#1{%
{\oargstyle{%
{\ttfamily[}%
- \@meta{#1}%
+ {\def\end@Macro@args{}\read@Macro@arg#1}%
{\ttfamily]}%
}}%
}
\def\@parg#1{%
{\pargstyle{%
{\ttfamily(}%
- \@meta{#1}%
+ {\def\end@Macro@args{}\read@Macro@arg#1}%
{\ttfamily)}%
}}%
}
\def\@aarg#1{%
{\aargstyle{%
{\ttfamily<}%
- \@meta{#1}%
+ {\def\end@Macro@args{}\read@Macro@arg#1}%
{\ttfamily>}%
}}%
}
@@ -166,7 +157,7 @@
\@parg{#1}\read@Macro@arg
}
\def\read@Macro@aarg<#1>>{%
- \aarg{#1}\read@Macro@arg
+ \@aarg{#1}\read@Macro@arg
}
\def\read@Macro@angle<{%
\futurelet\@let@token\read@Macro@angle@
@@ -249,6 +240,7 @@
\newcommand*\MacroArgs{%
\begingroup
\def\end@Macro@args{\endgroup\xspace}%
+ \macroargsstyle
\read@Macro@arg
}
\RequirePackage{xspace}