From 081b1c0da58e16ccc2583b2417048d1849508606 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Nov 2011 23:02:47 +0000 Subject: ydoc (19nov11) git-svn-id: svn://tug.org/texlive/trunk@24709 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ydoc/README | 11 +- Master/texmf-dist/doc/latex/ydoc/ydoc.pdf | Bin 312854 -> 324025 bytes Master/texmf-dist/source/latex/ydoc/ydoc.dtx | 172 ++++++++++++++++++++--- Master/texmf-dist/tex/generic/ydoc/ydocincl.tex | 106 ++++++++++++++ Master/texmf-dist/tex/generic/ydoc/ydocstrip.tex | 83 +++++++++++ Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty | 4 +- Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty | 5 +- Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty | 24 +++- Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty | 4 +- Master/texmf-dist/tex/latex/ydoc/ydoc.cfg | 4 +- Master/texmf-dist/tex/latex/ydoc/ydoc.cls | 4 +- Master/texmf-dist/tex/latex/ydoc/ydoc.sty | 4 +- Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex | 84 ----------- 13 files changed, 384 insertions(+), 121 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/ydoc/ydocincl.tex create mode 100644 Master/texmf-dist/tex/generic/ydoc/ydocstrip.tex delete mode 100644 Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/ydoc/README b/Master/texmf-dist/doc/latex/ydoc/README index 99c38fb99fd..42216bd3c89 100644 --- a/Master/texmf-dist/doc/latex/ydoc/README +++ b/Master/texmf-dist/doc/latex/ydoc/README @@ -37,11 +37,16 @@ Copy all files to their correct location of your local TEXMF tree. For example under Linux a personal TEXMF is normally located at '~/texmf' ('$HOME/texmf'). The files can be installed using the following Linux commands. For - mkdir -p ${TEXMF}/tex/latex/ydoc/ - cp ydoc.cls ydoc*.sty ydoc.cfg ydocstrip.tex ${TEXMF}/tex/latex/ydoc/ + mkdir -p "${TEXMF}/tex/latex/ydoc/" + mkdir -p "${TEXMF}/source/latex/ydoc/" + mkdir -p "${TEXMF}/doc/latex/ydoc/" + mkdir -p "${TEXMF}/tex/generic/ydoc/" + cp ydoc.sty ydoc.cls ydoc-code.sty ydoc-desc.sty ydoc-doc.sty ydoc-expl.sty ydoc.cfg "${TEXMF}/tex/latex/ydoc" + cp ydoc.dtx ydoc.ins "${TEXMF}/source/latex/ydoc" + cp ydoc.pdf README "${TEXMF}/doc/latex/ydoc" + cp ydocincl.tex ydocstrip.tex "${TEXMF}/tex/generic/ydoc" Update the tree database file (might be not required for modern versions and personal TEXMF trees): texhash ${TEXMF} - diff --git a/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf b/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf index 5ee0fb10f27..fe39b805255 100644 Binary files a/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf and b/Master/texmf-dist/doc/latex/ydoc/ydoc.pdf differ diff --git a/Master/texmf-dist/source/latex/ydoc/ydoc.dtx b/Master/texmf-dist/source/latex/ydoc/ydoc.dtx index 406e1277337..8f96314275b 100644 --- a/Master/texmf-dist/source/latex/ydoc/ydoc.dtx +++ b/Master/texmf-dist/source/latex/ydoc/ydoc.dtx @@ -1,9 +1,13 @@ % \iffalse %<*driver> -\expandafter\ifx\csname NeedsTeXFormat\endcsname\relax\else \begingroup +\def\latexfmt{LaTeX2e} +\ifx\latexfmt\fmtname \long\def\skip#1\NeedsTeXFormat{\endgroup\NeedsTeXFormat} \expandafter\skip +\else +\endgroup +\let\NeedsTeXFormat\end \fi % % \fi @@ -13,8 +17,9 @@ % \fi % % \iffalse +% \begin{macrocode} \expandafter\ifx\csname ydocstripversion\endcsname\relax\else - \noindent + \endinput \fi \chardef\ydocstripversion=1 @@ -87,7 +92,7 @@ \fi \endgroup } - +% \end{macrocode} % \fi % \iffalse % @@ -130,6 +135,7 @@ \generate{% \file{ydocstrip.tex}{\from{ydoc.dtx}{ydocstrip.tex}}% + \file{ydocincl.tex} {\from{ydoc.dtx}{ydocincl.tex}}% \file{ydoc.ins} {\from{ydoc.dtx}{ydoc.ins}}% \file{ydoc.cls} {\from{ydoc.dtx}{ydoc.cls}}% \file{ydoc.sty} {\from{ydoc.dtx}{ydoc.sty}}% @@ -154,6 +160,7 @@ \Msg{* ydoc-expl.sty *}% \Msg{* ydoc-doc.sty *}% \Msg{* ydocstrip.tex *}% +\Msg{* ydocincl.tex *}% \Msg{* *}% \Msg{* To produce the documentation run the file ydoc.dtx *}% \Msg{* through LaTeX. *}% @@ -175,15 +182,15 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{ydoc.dtx}[% %<=*DATE> - 2011/08/11 + 2011/11/19 %<=/DATE> %<=*VERSION> - v0.5alpha + v0.6alpha %<=/VERSION> DTX file of ydoc] \message{^^JRun this DTX file using 'tex' to extract all files!^^J} -\documentclass{ydoc}[2011/08/11] +\documentclass{ydoc} \newdimen\tempskip @@ -229,9 +236,9 @@ % \GetFileInfoSVN{ydoc.dtx} % % \title{The \textsf{\textbf{ydoc}} Class and Packages} -% \author{Martin Scharrer \\ \href{mailto:martin@scharrer-online.de}{martin@scharrer-online.de} \\ -% \url{http://latex.scharrer-online.de/ydoc/}\\ -% CTAN: \url{http://tug.ctan.org/pkg/ydoc}} +% \author{Martin Scharrer} +% \repository{https://bitbucket.org/martin_scharrer/ydoc/} +% \email{martin@scharrer.de} % \makeatletter % \date{Version \expandafter\@gobble\fileversion\\[0.5ex]\filedate} % \makeatother @@ -298,7 +305,7 @@ % The implementation of macros can be documented using this environment. The actual \meta{macro code} must be placed in a \env{macrocode} environment. % Longer macro definition can be split using multiple \env{macrocode} environments with interleaved documentation texts. % -% The \pkg{ydoc} definition of the \env{macro} environment has an additional feature compare to \pkg{doc}. The arguments of the macro (|#1|, |#2|, \ldots) can be +% The \pkg{ydoc} definition of the \env{macro} environment has an additional feature compare to \pkg{doc}. The arguments of the macro (|#1|, |#2|, \ldots) can be % documented in a vertical list. The environment has an optional argument to declare the \meta{number of arguments} the macro implementation has. % The descriptions of this macro arguments are read from the next arguments of the environment. If the \meta{number of arguments} is not given or zero (or less) % no further arguments are read by the \env{macro} environment. @@ -409,7 +416,7 @@ % The \env{DescribeEnv} can be used to describe environments in the same way the \cs{DescribeMacro} macro describes macros. % Supported \meta{arguments} are shown in Table~\ref{tab:macroargs}. % Potential \meta{body content} can be placed between the begin and end of the environment description to explain the user what kind of material -% should be placed inside it. +% should be placed inside it. % The environment also exists in macro form as \cs{DescribeEnv}, which allows to provide small \meta{body content} as an optional argument. % Please note that for this optional argument a \cs{MacroArgs} is automatically inserted, but not for the \cs{DescribeEnv} environment content. % @@ -487,7 +494,7 @@ % This macros are used to define the style in which the corresponding macros above are being formatted. % They are used like \MacroArgs '{'<\textbackslash stylemacro>{}'}' to allow the styles to % use macros like |\ttfamily| or |\texttt|\marg{material}. By default the optional argument and the also optional star are -% printed in the color `|optional|' which is a 65\% gray. +% printed in the color `|optional|' which is a 65\% gray. % % \subsection{Settings} % The following macro and dimensions can be redefined by the user to adjust the layout of the package documentation. @@ -511,7 +518,6 @@ % \clearpage % \section{Implementation} % -% % \iffalse %<*ydoc.cls> % \fi @@ -1004,7 +1010,7 @@ % % %<*DRIVER> - 2011/08/11 develop + 2099/01/01 develop % ydoc package to provide 'doc' macros] % \end{macrocode} @@ -1244,6 +1250,10 @@ \def\package{\def\@package} \package{\jobname} +\def\bundle{\def\@bundle} +\let\@bundle\@empty + + \def\ctanlocation{\def\@ctanlocation##1} \ctanlocation{http://www.ctan.org/pkg/#1} @@ -1253,12 +1263,15 @@ \begingroup \edef\@tempa{% \endgroup + CTAN: \noexpand\url - {\@ctanlocation{\@package}}% + {\@ctanlocation{\ifx\@bundle\@empty\@package\else\@bundle\fi}}% }% \@tempa } +\let\@repository\@empty +\protected\def\repository{\urldef\@repository\url} \protected\def\homepage{\urldef\@homepage\url} \protected\def\email{\hyper@normalise\email@} \def\email@#1{\def\@plainemail{#1}\def\@email{\hyper@linkurl{\Hurl{#1}}{mailto:#1}}} @@ -1267,17 +1280,23 @@ \let\@plainemail\empty \title{The \texorpdfstring{\pkgtitle{\@package}}{\@package} Package} +\def\@bundlesubtitle{Part of the \texorpdfstring{\pkgtitle{\@bundle}}{\@bundle} bundle} \protected\def\pkgtitle#1{% \texorpdfstring{\textsf{#1}}{#1}% } + + \def\@maketitle{% \newpage \null\vskip 2em \begin{center}% \let\footnote\thanks {\LARGE \@title \par }\vskip 1.5em% + \ifx\@bundle\@empty\else + {\large \@bundlesubtitle \par }\vskip 1.5em% + \fi {\large \lineskip .5em% \begin{tabular}[t]{c}% \@author @@ -1297,6 +1316,14 @@ \end{tabular}% \par}% \vskip 1em + \ifx\@repository\@empty\else + {\large \lineskip .5em% + \begin{tabular}[t]{c}% + VC: \@repository + \end{tabular}% + \par}% + \fi + \vskip 1em {\large \@date }% \end{center}% \par\vskip 1.5em @@ -1338,7 +1365,7 @@ % % %<*DRIVER> - 2011/08/11 develop + 2099/01/01 develop % ydoc package to describe macros, environments, options etc.] % \end{macrocode} @@ -1726,7 +1753,7 @@ % % \begin{macro}{\handle@Macro@arg} % Checks if next token is the begin of a valid macro argument and calls -% the appropriate read macro or the end macro otherwise. +% the appropriate read macro or the end macro otherwise. % \begin{macrocode} \def\handle@Macro@arg{% \expandafter\let\expandafter\handler\csname handle@Macro@token@\meaning\@let@token\endcsname @@ -1758,7 +1785,7 @@ % \end{macro} % % \begin{macro}{\end@Macro@args} -% Closes box as calls hook. Might be locally redefined by some +% Closes box as calls hook. Might be locally redefined by some % macros calling \cs{read@Macro@arg}. % \begin{macrocode} \def\end@Macro@args{% @@ -2108,6 +2135,7 @@ \define@Macro@handler\AlsoMacro{} \define@Macro@handler\DescribeMacro{} \define@Macro@handler\DescribeKey{} +\define@Macro@handler\DescribeScript{} % \end{macrocode} % % \begin{macro}{\MacroArgs} @@ -2249,7 +2277,7 @@ % % Sets after-macro-arguments hook. % First checks if the environment or macro version was used. -% The environment starts a new line only if the next token isn't |\end|, +% The environment starts a new line only if the next token isn't |\end|, % which is taken as end of the environment. % \begin{macrocode} \ifx\@currenvir\DescribeEnv@string @@ -2719,5 +2747,111 @@ % % \fi % +% \iffalse +%<*ydocincl.tex> +% \fi +% +% \begin{macrocode} +\expandafter\ifx\csname ydocinclversion\endcsname\relax\else + \endinput +\fi + +\chardef\ydocinclversion=1 + +\newread\inFile +\newread\subFile +\newwrite\outFile +\newif\ifContinue +\newlinechar=`^^J + +\def\makeOther#1{\catcode`#1=12\relax} + +\let\inLine\relax +\let\lastLine\relax + +\def\includefiles#1#2{% + \begingroup + \immediate\openin\inFile#1\relax + \immediate\openout\outFile#2\relax + \makeOther\@% + \makeOther\ \makeOther\\\makeOther\$% + \makeOther\#\makeOther\^\makeOther\^^K% + \makeOther\_\makeOther\^^A\makeOther\%% + \makeOther\~\makeOther\{\makeOther\}\makeOther\&% + \endlinechar-1\relax + \Continuetrue + \loop + \let\lastLine\inLine + \read\inFile to\inLine + \ifeof\inFile + \Continuefalse + \else + \expandafter\checkLine\inLine\empty\empty\empty\endLine + \fi + \ifContinue + \repeat + \immediate\closein\inFile + \immediate\closeout\outFile + \endgroup + \end +} + +\def\copyline{% + \immediate\write\outFile{\inLine}% +} + +\chardef\percentcharnum=`\% + +\begingroup +\makeOther\%\makeOther\@\relax +\gdef\SubFileOptionString{%<@}\relax +\gdef\CommentChar{%}\relax +\catcode`\|=0 +\makeOther\ \makeOther\\|relax +|gdef|IfFalseString{% \iffalse}|relax +|gdef|FiString{% \fi}|relax +|endgroup + +\def\checkLine#1#2#3#4\endLine{% + \def\firstthree{#1#2#3}% + \ifx\firstthree\SubFileOptionString + \readSubFile#4\endLine + \else + \copyline + \fi +} + +\def\readSubFile#1>#2\endLine{% + \immediate\openin\subFile=#1\relax + \ifeof\subFile + % File not found + \else + \message{^^JIncluding subfile '#1'^^J}% + \immediate\write\outFile{\CommentChar<*#1>}% + \ifx\lastLine\IfFalseString + \immediate\write\outFile{\FiString}% + \fi + \copySubFile + \ifx\lastLine\IfFalseString + \immediate\write\outFile{\IfFalseString}% + \fi + \immediate\write\outFile{\CommentChar}% + \fi + \immediate\closein\subFile +} + +\def\copySubFile{% + \read\subFile to\subLine + \ifeof\subFile\else + \immediate\write\outFile{\subLine}% + \expandafter\copySubFile + \fi +} +% \end{macrocode} +% +% \iffalse +% +% \fi +% % \Finale % \endinput diff --git a/Master/texmf-dist/tex/generic/ydoc/ydocincl.tex b/Master/texmf-dist/tex/generic/ydoc/ydocincl.tex new file mode 100644 index 00000000000..1a1f0b5c00f --- /dev/null +++ b/Master/texmf-dist/tex/generic/ydoc/ydocincl.tex @@ -0,0 +1,106 @@ +%% +%% This is file `ydocincl.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ydoc.dtx (with options: `ydocincl.tex') +%% +\expandafter\ifx\csname ydocinclversion\endcsname\relax\else + \endinput +\fi + +\chardef\ydocinclversion=1 + +\newread\inFile +\newread\subFile +\newwrite\outFile +\newif\ifContinue +\newlinechar=`^^J + +\def\makeOther#1{\catcode`#1=12\relax} + +\let\inLine\relax +\let\lastLine\relax + +\def\includefiles#1#2{% + \begingroup + \immediate\openin\inFile#1\relax + \immediate\openout\outFile#2\relax + \makeOther\@% + \makeOther\ \makeOther\\\makeOther\$% + \makeOther\#\makeOther\^\makeOther\^^K% + \makeOther\_\makeOther\^^A\makeOther\%% + \makeOther\~\makeOther\{\makeOther\}\makeOther\&% + \endlinechar-1\relax + \Continuetrue + \loop + \let\lastLine\inLine + \read\inFile to\inLine + \ifeof\inFile + \Continuefalse + \else + \expandafter\checkLine\inLine\empty\empty\empty\endLine + \fi + \ifContinue + \repeat + \immediate\closein\inFile + \immediate\closeout\outFile + \endgroup + \end +} + +\def\copyline{% + \immediate\write\outFile{\inLine}% +} + +\chardef\percentcharnum=`\% + +\begingroup +\makeOther\%\makeOther\@\relax +\gdef\SubFileOptionString{%<@}\relax +\gdef\CommentChar{%}\relax +\catcode`\|=0 +\makeOther\ \makeOther\\|relax +|gdef|IfFalseString{% \iffalse}|relax +|gdef|FiString{% \fi}|relax +|endgroup + +\def\checkLine#1#2#3#4\endLine{% + \def\firstthree{#1#2#3}% + \ifx\firstthree\SubFileOptionString + \readSubFile#4\endLine + \else + \copyline + \fi +} + +\def\readSubFile#1>#2\endLine{% + \immediate\openin\subFile=#1\relax + \ifeof\subFile + % File not found + \else + \message{^^JIncluding subfile '#1'^^J}% + \immediate\write\outFile{\CommentChar<*#1>}% + \ifx\lastLine\IfFalseString + \immediate\write\outFile{\FiString}% + \fi + \copySubFile + \ifx\lastLine\IfFalseString + \immediate\write\outFile{\IfFalseString}% + \fi + \immediate\write\outFile{\CommentChar}% + \fi + \immediate\closein\subFile +} + +\def\copySubFile{% + \read\subFile to\subLine + \ifeof\subFile\else + \immediate\write\outFile{\subLine}% + \expandafter\copySubFile + \fi +} +\endinput +%% +%% End of file `ydocincl.tex'. diff --git a/Master/texmf-dist/tex/generic/ydoc/ydocstrip.tex b/Master/texmf-dist/tex/generic/ydoc/ydocstrip.tex new file mode 100644 index 00000000000..6d27fd42d0c --- /dev/null +++ b/Master/texmf-dist/tex/generic/ydoc/ydocstrip.tex @@ -0,0 +1,83 @@ +%% +%% 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 + \endinput +\fi + +\chardef\ydocstripversion=1 + +\input docstrip + +\def\checkOption<#1{% + \ifcase + \ifx*#10\else \ifx/#11\else + \ifx+#12\else \ifx-#13\else + \ifx<#14\else + \ifx=#15\else + \ifx!#16\else + 10\fi\fi\fi\fi\fi\fi\fi\relax + \expandafter\starOption\or + \expandafter\slashOption\or + \expandafter\plusOption\or + \expandafter\minusOption\or + \expandafter\verbOption\or + \expandafter\varOption\or + \expandafter\valueOption\else + \expandafter\doOption\fi + #1} + +\def\varOption =#1#2>#3\endLine{{% + \ifx*#1\relax + \edef\varStop{\perCent<=/#2>}% + \global\expandafter\let\csname ydocstrip@var@#2\endcsname\empty% + \expandafter\def\csname ydocstrip@var@#2\endcsname##1{}% + \loop + \ifeof\inFile + \errmessage{Source file ended while reading a multi-line variable content!}% + \fi + \read\inFile to \inLine + \if 1\ifx\inLine\varStop 0\fi 1% if not inLine==varStop + \expandafter\xdef\csname ydocstrip@var@#2\endcsname{\csname ydocstrip@var@#2\endcsname^^J\inLine}% + \maybeMsg{.}% + \repeat + \else + \ifx/#1\relax + \errmessage{Error in expression: spurious '<=/#2>'}% + \else + \ifx+#1\relax + \expandafter\ifx\csname ydocstrip@var@#2\endcsname\relax + \expandafter\xdef\csname ydocstrip@var@#2\endcsname{#3}% + \else + \expandafter\xdef\csname ydocstrip@var@#2\endcsname{\csname ydocstrip@var@#2\endcsname^^J#3}% + \fi + \else + \expandafter\gdef\csname ydocstrip@var@#1#2\endcsname{#3}% + \fi + \fi + \fi +}} + +\def\valueOption !#1>#2\endLine{% + \begingroup + \expandafter\let\expandafter\var\csname ydocstrip@var@#1\endcsname + \ifx\var\relax + \errmessage{Used variable '#1' was never defined!}% + \else + \ifx\var\empty\else + \def\do##1##2##3{% + \StreamPut##1{\csname ydocstrip@var@#1\endcsname}% + }% + \activefiles + \fi + \fi + \endgroup +} +\endinput +%% +%% End of file `ydocstrip.tex'. diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty index a62e7ba0c1e..723c8e8aff4 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-code.sty @@ -8,8 +8,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-code}[% - 2011/08/11 - v0.5alpha + 2011/11/19 + v0.6alpha ydoc package to document macro code] \RequirePackage{hyperref} \hypersetup{colorlinks=true,pdfborder=0 0 0,pdfborderstyle={}} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty index 8419a02a597..7b27eaf1841 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-desc.sty @@ -8,8 +8,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-desc}[% - 2011/08/11 - v0.5alpha + 2011/11/19 + v0.6alpha ydoc package to describe macros, environments, options etc.] \IfFileExists{needspace.sty}{% \RequirePackage{needspace} @@ -388,6 +388,7 @@ \define@Macro@handler\AlsoMacro{} \define@Macro@handler\DescribeMacro{} \define@Macro@handler\DescribeKey{} +\define@Macro@handler\DescribeScript{} \newcommand*\MacroArgs{% \begingroup \def\end@Macro@args{\endgroup\xspace}% diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty index 9164dbd36aa..d9320425f40 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-doc.sty @@ -8,8 +8,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-doc}[% - 2011/08/11 - v0.5alpha + 2011/11/19 + v0.6alpha ydoc package to provide 'doc' macros] \newcount\ydoc@bslashcnt \def\ydoc@countbslashes{% @@ -149,6 +149,9 @@ \def\package{\def\@package} \package{\jobname} +\def\bundle{\def\@bundle} +\let\@bundle\@empty + \def\ctanlocation{\def\@ctanlocation##1} \ctanlocation{http://www.ctan.org/pkg/#1} @@ -158,12 +161,15 @@ \begingroup \edef\@tempa{% \endgroup + CTAN: \noexpand\url - {\@ctanlocation{\@package}}% + {\@ctanlocation{\ifx\@bundle\@empty\@package\else\@bundle\fi}}% }% \@tempa } +\let\@repository\@empty +\protected\def\repository{\urldef\@repository\url} \protected\def\homepage{\urldef\@homepage\url} \protected\def\email{\hyper@normalise\email@} \def\email@#1{\def\@plainemail{#1}\def\@email{\hyper@linkurl{\Hurl{#1}}{mailto:#1}}} @@ -172,6 +178,7 @@ \let\@plainemail\empty \title{The \texorpdfstring{\pkgtitle{\@package}}{\@package} Package} +\def\@bundlesubtitle{Part of the \texorpdfstring{\pkgtitle{\@bundle}}{\@bundle} bundle} \protected\def\pkgtitle#1{% \texorpdfstring{\textsf{#1}}{#1}% @@ -183,6 +190,9 @@ \begin{center}% \let\footnote\thanks {\LARGE \@title \par }\vskip 1.5em% + \ifx\@bundle\@empty\else + {\large \@bundlesubtitle \par }\vskip 1.5em% + \fi {\large \lineskip .5em% \begin{tabular}[t]{c}% \@author @@ -202,6 +212,14 @@ \end{tabular}% \par}% \vskip 1em + \ifx\@repository\@empty\else + {\large \lineskip .5em% + \begin{tabular}[t]{c}% + VC: \@repository + \end{tabular}% + \par}% + \fi + \vskip 1em {\large \@date }% \end{center}% \par\vskip 1.5em diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty index 70781dba415..3115370a579 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc-expl.sty @@ -8,8 +8,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc-expl}[% - 2011/08/11 - v0.5alpha + 2011/11/19 + v0.6alpha ydoc package to insert live examples of LaTeX code] \RequirePackage{listings} \lst@RequireAspects{writefile} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg b/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg index 2820d97184e..049f0f41132 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cfg @@ -8,8 +8,8 @@ %% %% Please delete the following line on manual changes: \ProvidesFile{ydoc.cfg}[% - 2011/08/11 - v0.5alpha + 2011/11/19 + v0.6alpha Default config file for ydoc] \usepackage[T1]{fontenc} \IfFileExists{fourier.sty}{% diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls index 6ac1b821f2a..a2bc248db9f 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.cls +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.cls @@ -8,8 +8,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ydoc}[% - 2011/08/11 - v0.5alpha + 2011/11/19 + v0.6alpha ydoc class: document LaTeX class and packages] \PassOptionsToClass{a4paper}{article} \DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{article}} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty index aaa166c3072..6a3b3e016db 100644 --- a/Master/texmf-dist/tex/latex/ydoc/ydoc.sty +++ b/Master/texmf-dist/tex/latex/ydoc/ydoc.sty @@ -8,8 +8,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ydoc}[% - 2011/08/11 - v0.5alpha + 2011/11/19 + v0.6alpha ydoc package: document LaTeX class and packages] \RequirePackage{svn-prov}[2010/04/03] \RequirePackage{ydoc-code} diff --git a/Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex b/Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex deleted file mode 100644 index 358db8ae451..00000000000 --- a/Master/texmf-dist/tex/latex/ydoc/ydocstrip.tex +++ /dev/null @@ -1,84 +0,0 @@ -%% -%% 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{% - \ifcase - \ifx*#10\else \ifx/#11\else - \ifx+#12\else \ifx-#13\else - \ifx<#14\else - \ifx=#15\else - \ifx!#16\else - 10\fi\fi\fi\fi\fi\fi\fi\relax - \expandafter\starOption\or - \expandafter\slashOption\or - \expandafter\plusOption\or - \expandafter\minusOption\or - \expandafter\verbOption\or - \expandafter\varOption\or - \expandafter\valueOption\else - \expandafter\doOption\fi - #1} - -\def\varOption =#1#2>#3\endLine{{% - \ifx*#1\relax - \edef\varStop{\perCent<=/#2>}% - \global\expandafter\let\csname ydocstrip@var@#2\endcsname\empty% - \expandafter\def\csname ydocstrip@var@#2\endcsname##1{}% - \loop - \ifeof\inFile - \errmessage{Source file ended while reading a multi-line variable content!}% - \fi - \read\inFile to \inLine - \if 1\ifx\inLine\varStop 0\fi 1% if not inLine==varStop - \expandafter\xdef\csname ydocstrip@var@#2\endcsname{\csname ydocstrip@var@#2\endcsname^^J\inLine}% - \maybeMsg{.}% - \repeat - \else - \ifx/#1\relax - \errmessage{Error in expression: spurious '<=/#2>'}% - \else - \ifx+#1\relax - \expandafter\ifx\csname ydocstrip@var@#2\endcsname\relax - \expandafter\xdef\csname ydocstrip@var@#2\endcsname{#3}% - \else - \expandafter\xdef\csname ydocstrip@var@#2\endcsname{\csname ydocstrip@var@#2\endcsname^^J#3}% - \fi - \else - \expandafter\gdef\csname ydocstrip@var@#1#2\endcsname{#3}% - \fi - \fi - \fi -}} - -\def\valueOption !#1>#2\endLine{% - \begingroup - \expandafter\let\expandafter\var\csname ydocstrip@var@#1\endcsname - \ifx\var\relax - \errmessage{Used variable '#1' was never defined!}% - \else - \ifx\var\empty\else - \def\do##1##2##3{% - \StreamPut##1{\csname ydocstrip@var@#1\endcsname}% - }% - \activefiles - \fi - \fi - \endgroup -} - -\endinput -%% -%% End of file `ydocstrip.tex'. -- cgit v1.2.3