From b38d0dc03b854ce6119171b7c516e9671aaafddf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Apr 2009 17:11:56 +0000 Subject: svn-multi 2.1 (21apr09) git-svn-id: svn://tug.org/texlive/trunk@12795 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/svn-multi/Makefile | 4 +- .../source/latex/svn-multi/svn-multi.dtx | 56 +++++++++++++--------- 2 files changed, 35 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/source/latex/svn-multi') diff --git a/Master/texmf-dist/source/latex/svn-multi/Makefile b/Master/texmf-dist/source/latex/svn-multi/Makefile index b6b663f2aa2..719834dda14 100644 --- a/Master/texmf-dist/source/latex/svn-multi/Makefile +++ b/Master/texmf-dist/source/latex/svn-multi/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 628 2007-07-10 20:32:06Z martin $ PACKAGE=svn-multi -PACKFILES = ${PACKAGE}.dtx ${PACKAGE}.ins ${PACKAGE}.pdf svn-multi-pl.dtx svn-multi.pl example_main.tex \ +PACKFILES = ${PACKAGE}.dtx ${PACKAGE}.ins ${PACKAGE}.pdf svn-multi-pl.dtx example_main.tex \ example_chap1.tex example.pdf Makefile README group_example.tex TEXAUX = *.aux *.log *.glo *.ind *.idx *.out *.svn *.svx *.svt *.toc *.ilg *.gls *.hd TESTDIR = tests @@ -41,7 +41,7 @@ package: ${PACKAGE}.sty ${PACKAGE}.pl %.eps: %.dia dia -t eps -e $@ $< -${PACKAGE}.pdf: +${PACKAGE}.pdf: ${PACKAGE}.sty ${INSGENERATED}: *.dtx ${PACKAGE}.ins yes | latex ${PACKAGE}.ins diff --git a/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx b/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx index c5e3f0af0c2..bfbd61432aa 100644 --- a/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx +++ b/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx @@ -24,13 +24,13 @@ % \fi % \iffalse %<*package|driver> -% $Id: svn-multi.dtx 691 2009-03-27 21:37:56Z martin $ +% $Id: svn-multi.dtx 845 2009-04-21 12:03:08Z martin $ % -\def\svnmulti@version {v2.1} +\def\svnmulti@version {v2.1a} \def\svnmulti@rev $#1: #2 ${\def\svnmulti@rev{#2}} \def\svnmulti@date $#1: #2-#3-#4 #5 ${\def\svnmulti@date{#2/#3/#4}} -\svnmulti@rev $Rev: 691 $\relax -\svnmulti@date $Date: 2009-03-27 21:37:56 +0000 (Fri, 27 Mar 2009) $\relax +\svnmulti@rev $Rev: 845 $\relax +\svnmulti@date $Date: 2009-04-21 13:03:08 +0100 (Tue, 21 Apr 2009) $\relax % %<*driver> @@ -41,7 +41,7 @@ \def\svnmulti@today{{\year#2\month#3\day#4\today}}% \def\svnmulti@date{#2/#3/#4}% } -\svnmulti@date $Date: 2009-03-27 21:37:56 +0000 (Fri, 27 Mar 2009) $ +\svnmulti@date $Date: 2009-04-21 13:03:08 +0100 (Tue, 21 Apr 2009) $ \documentclass{ltxdoc} @@ -287,7 +287,7 @@ %<*package> % \fi % -% \CheckSum{2638} +% \CheckSum{2652} % % {\makeatother % \CharacterTable @@ -330,6 +330,8 @@ % support, auto-include of images, files as subgroups and table of revisions.} % \changes{v2.1}{2009/03/27}{Added automatic extraction of keywords from % Subversion 'entries' file: 'autokw' option} +% \changes{v2.1a}{2009/04/21}{Bugfix for macros which external if switches which +% might not be defined by all classes} % % ^^A \GetFileInfo{svn-multi.dtx} % @@ -2741,8 +2743,8 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \def\svn@removedotslash#1{% \def\svn@removedotslash@##1##2##3\relax{% \svn@ifequal{./}{##1##2}% - {\edef#1{##3}\def\next{\svn@removedotslash@##3\empty\empty\empty\relax}}% - {\edef#1{##1##2##3}\let\next\relax}% + {\def\next{\svn@removedotslash@##3\empty\empty\empty\relax}}% + {\xdef#1{##1##2##3}\let\next\relax}% \next }% \expandafter\svn@removedotslash@#1\empty\empty\empty\relax @@ -2776,9 +2778,10 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \let\svnmulti@fink@prepare\fink@prepare \renewcommand*{\fink@prepare}[1]{% \svnmulti@fink@prepare{#1}% + \svn@pushfilestack \if@svnmulti@groups \svn@ifequal{\svn@filepath}{\jobname.\svn@mainext}% - {\global\let\svn@pg\svn@g}% + {\xdef\svn@pg{\svn@g}}% {\xdef\svn@pg{\svn@filedir\svn@filebase}}% \fi \xdef\svn@filebase{\fink@nextbase}% @@ -2802,6 +2805,7 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \def\fink@restore#1{% \svnmulti@endinputfilehook \svnmulti@fink@restore{#1}% + \svn@popfilestack \xdef\svn@filebase{\finkbase}% \xdef\svn@fileext{\finkext}% \xdef\svn@filedir{\finkdir}% @@ -2900,13 +2904,6 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \fi } -\svnmulti@atbegininputfile{% - \svn@pushfilestack -} - -\svnmulti@atendinputfile{% - \svn@popfilestack -}% % % \end{macrocode} @@ -3379,6 +3376,9 @@ lof,log,lot,out,svn,svt,svx,toc} \AtBeginDocument{% \if@svnmulti@subgroups \ifsvnsubgroups + \@ifundefined{@svng@\svn@g @files@\jobname}% + {% + \@namedef{@svng@\svn@g @files@\jobname}{1}% \@ifundefined{@svng@\svn@g @files}% {% \expandafter @@ -3389,6 +3389,7 @@ lof,log,lot,out,svn,svt,svx,toc} \xdef\csname @svng@\svn@g @files\endcsname {\jobname,\csname @svng@\svn@g @files\endcsname}% }% + }{}% \svnsubgroup \fi \fi @@ -3414,10 +3415,10 @@ lof,log,lot,out,svn,svt,svx,toc} \if@svnmulti@groups \def\svnexternalgroup#1{% \svn@ifequal{#1}{*}% + {\def\svn@externalgroup{\svn@pg}}% {\def\svn@externalgroup{#1}}% - {\def\svn@externalgroup{\svn@g}}% } -\def\svn@externalgroup{\svn@g} +\def\svn@externalgroup{\svn@pg} \else \def\svn@externalgroup{} \fi @@ -3434,7 +3435,7 @@ lof,log,lot,out,svn,svt,svx,toc} \newcommand*\svnexternal[2][]{% \svn@pushfilestack \svn@ifequal{#1}{*}% - {\edef\svn@eg{\svn@g}}% + {\edef\svn@eg{\svn@pg}}% {\svn@ifempty{#1}% {\edef\svn@eg{\svn@externalgroup}}% {\edef\svn@eg{#1}}% @@ -3463,7 +3464,7 @@ lof,log,lot,out,svn,svt,svx,toc} \svn@checkwrite \begingroup \svn@ifequal{#1}{*}% - {\def\svn@temp{\svn@g}}% + {\def\svn@temp{\svn@pg}}% {\svn@ifempty{#1}% {\def\svn@temp{\svn@externalgroup}}% {\def\svn@temp{#1}}% @@ -3593,7 +3594,7 @@ lof,log,lot,out,svn,svt,svx,toc} % \begin{macrocode} \def\svngraphicsgroup#1{% \svn@ifequal{#1}{*}% - {\def\svn@graphicsgroup{\svn@g}}% + {\def\svn@graphicsgroup{\svn@pg}}% {\def\svn@graphicsgroup{#1}}% } \def\svn@graphicsgroup{\svn@externalgroup} @@ -3716,6 +3717,9 @@ patch generated macros '\string\pgf@image@!' from the 'pgf' package!}% % \begin{macro}{\tableofrevisions} % The |\tableofcontents| macro from standard \LaTeX\ is adapted for this macro. % Classes which provide chapters will get a different table then one which not. +% +% The external (\ie non-svn-multi) if-switches are masked using |\ifx| and +% |\csname| to avoid \TeX{} if-parsing errors when they are not defined. % \begin{macrocode} \AtBeginDocument{% \ifx\chapter\@undefined @@ -3731,7 +3735,9 @@ patch generated macros '\string\pgf@image@!' from the 'pgf' package!}% %% Adapted from the \tableofcontents macro, LaTeX `book' class [2005/09/16] \newcommand\tableofrevisions{% - \if@twocolumn + \expandafter\ifx + \csname if@twocolumn\expandafter\endcsname + \csname iftrue\endcsname \@restonecoltrue\onecolumn \else \@restonecolfalse @@ -3739,7 +3745,11 @@ patch generated macros '\string\pgf@image@!' from the 'pgf' package!}% \chapter*{\svnrevisionsname \@mkboth{\MakeUppercase\svnrevisionsname}{\MakeUppercase\svnrevisionsname}}% \svn@input{\jobname .\svn@svt}% - \if@restonecol\twocolumn\fi + \expandafter\ifx + \csname if@restonecol\expandafter\endcsname + \csname iftrue\endcsname + \twocolumn + \fi } \fi -- cgit v1.2.3