summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-14 00:11:01 +0000
committerKarl Berry <karl@freefriends.org>2012-12-14 00:11:01 +0000
commit2071d59f0fa2c729b7b112423d8659ef92ebc0d7 (patch)
treea36c6657d2fb4ddf9ee28c3010a731208db65dfc
parent4996e3ce908a0e5ec391ab42143b17e17751c137 (diff)
dirtree (14dec12)
git-svn-id: svn://tug.org/texlive/trunk@28524 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/dirtree/dirtree.pdfbin143783 -> 144620 bytes
-rw-r--r--Master/texmf-dist/source/generic/dirtree/dirtree.dtx37
-rw-r--r--Master/texmf-dist/tex/generic/dirtree/dirtree.sty4
-rw-r--r--Master/texmf-dist/tex/generic/dirtree/dirtree.tex20
4 files changed, 35 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/generic/dirtree/dirtree.pdf b/Master/texmf-dist/doc/generic/dirtree/dirtree.pdf
index 9b41d309138..9aaf1318ec0 100644
--- a/Master/texmf-dist/doc/generic/dirtree/dirtree.pdf
+++ b/Master/texmf-dist/doc/generic/dirtree/dirtree.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/dirtree/dirtree.dtx b/Master/texmf-dist/source/generic/dirtree/dirtree.dtx
index b3886623eb9..1991b1b35ef 100644
--- a/Master/texmf-dist/source/generic/dirtree/dirtree.dtx
+++ b/Master/texmf-dist/source/generic/dirtree/dirtree.dtx
@@ -24,8 +24,8 @@
%%
% \fi
% \iffalse
-%<latex-wrapper|tex> \def\fileversion{0.31}
-%<latex-wrapper|tex> \def\filedate{2012/11/02}
+%<latex-wrapper|tex> \def\fileversion{0.32}
+%<latex-wrapper|tex> \def\filedate{2012/12/11}
%<*driver>
\documentclass{ltxdoc}
\GetFileInfo{dirtree.dtx}
@@ -63,6 +63,9 @@
% and \LaTeX.}
% \changes{v0.3}{2009/04/08}{xkeyval syntax, breakable tree}
% \changes{v0.31}{2012/11/02}{bug about some lengths}
+% \changes{v0.32}{2012/12/11}{bug about length (thanks to Philipp
+% K\"uhl). Some macro names changed in order to prevent clash with
+% other packages.}
%
% \DoNotIndex{\@,\@gobble,\@latex@error,\@nameuse}
% \DoNotIndex{\@ne,\@nil,\@namedef}
@@ -446,16 +449,18 @@
\edef\DTAtCode{\the\catcode`\@}
\catcode`\@=11
% \end{macrocode}
-% Define |\LOOP|, |\REPEAT|, and |\ITERATE| like |\loop|, |\repeat|,
-% and |\iterate|. The uppercase form allows to place loop inside
-% loop.
+% \changes{v0.32}{2012/12/11}{LOOP, REPEAT and ITERATE modified to DT@
+% form in order to prevent some clash with other packages.}
+% Define |\DT@loop|, |\DT@repeat|, and |\DT@iterate| like |\loop|,
+% |\repeat|, and |\iterate|. The |\DT@| form allows to place loop
+% inside loop.
% \begin{macrocode}
-\long\def\LOOP#1\REPEAT{%
- \def\ITERATE{#1\relax\expandafter\ITERATE\fi}%
- \ITERATE
- \let\ITERATE\relax
+\long\def\DT@loop#1\DT@repeat{%
+ \def\DT@iterate{#1\relax\expandafter\DT@iterate\fi}%
+ \DT@iterate
+ \let\DT@iterate\relax
}
-\let\REPEAT=\fi
+\let\DT@repeat=\fi
% \end{macrocode}
% Define some \LaTeX{} macros if we work under Plain \TeX{}.
% |\@namedef|-like for |\edef|.
@@ -559,7 +564,7 @@
}
% \end{macrocode}
% \end{macro}
-% \changes{0.31}{2012/11/02}{save lengths as lengths (not as macro)}
+% \changes{v0.31}{2012/11/02}{save lengths as lengths (not as macro)}
% In order to save some lengths we create newdimen
% \begin{macrocode}
\newdimen\DT@indent
@@ -669,7 +674,7 @@
% \begin{macrocode}
\DT@countiv=\DT@countii
\count@=\z@
- \LOOP
+ \DT@loop
% \end{macrocode}
% Look for previous node
% \begin{macrocode}
@@ -684,7 +689,7 @@
\count@=\@ne
\fi
\ifnum\count@=\z@
- \REPEAT
+ \DT@repeat
% \end{macrocode}
% Now |\DT@countiv| holds the index node connected to current node.
%
@@ -771,7 +776,11 @@
% \begin{macrocode}
\parindent=\DT@indent
\parskip=\DT@parskip
- \DT@baselineskip=\baselineskip
+% \end{macrocode}
+% \changes{v0.32}{2012/12/11}{Inverse order of assignation between
+% baselineskip and DT@baselineskip.}
+% \begin{macrocode}
+ \baselineskip=\DT@baselineskip
\let\strut\DT@strut
}
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/generic/dirtree/dirtree.sty b/Master/texmf-dist/tex/generic/dirtree/dirtree.sty
index a3b4ede5ca9..d1e4d0331e1 100644
--- a/Master/texmf-dist/tex/generic/dirtree/dirtree.sty
+++ b/Master/texmf-dist/tex/generic/dirtree/dirtree.sty
@@ -43,8 +43,8 @@
%% DESCRIPTION:
%% dirtree is a package displaying directory trees.
%%
- \def\fileversion{0.31}
- \def\filedate{2012/11/02}
+ \def\fileversion{0.32}
+ \def\filedate{2012/12/11}
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{dirtree}[\filedate\space v\fileversion\space
package wrapper for dirtree]
diff --git a/Master/texmf-dist/tex/generic/dirtree/dirtree.tex b/Master/texmf-dist/tex/generic/dirtree/dirtree.tex
index 0712a641f71..373ac726f99 100644
--- a/Master/texmf-dist/tex/generic/dirtree/dirtree.tex
+++ b/Master/texmf-dist/tex/generic/dirtree/dirtree.tex
@@ -43,17 +43,17 @@
%% DESCRIPTION:
%% dirtree is a package displaying directory trees.
%%
- \def\fileversion{0.31}
- \def\filedate{2012/11/02}
+ \def\fileversion{0.32}
+ \def\filedate{2012/12/11}
\message{`dirtree' v\fileversion, \filedate\space (jcc)}
\edef\DTAtCode{\the\catcode`\@}
\catcode`\@=11
-\long\def\LOOP#1\REPEAT{%
- \def\ITERATE{#1\relax\expandafter\ITERATE\fi}%
- \ITERATE
- \let\ITERATE\relax
+\long\def\DT@loop#1\DT@repeat{%
+ \def\DT@iterate{#1\relax\expandafter\DT@iterate\fi}%
+ \DT@iterate
+ \let\DT@iterate\relax
}
-\let\REPEAT=\fi
+\let\DT@repeat=\fi
\expandafter\ifx\csname DT@fromsty\endcsname\relax
\def\@namedef#1{\expandafter\def\csname #1\endcsname}
\def\@nameuse#1{\csname #1\endcsname}
@@ -142,7 +142,7 @@
\kern\dimen\z@
\DT@countiv=\DT@countii
\count@=\z@
- \LOOP
+ \DT@loop
\advance\DT@countiv \m@ne
\ifnum\@nameuse{DT@level@\the\DT@countiv} >
\@nameuse{DT@level@\the\DT@countii}\relax
@@ -150,7 +150,7 @@
\count@=\@ne
\fi
\ifnum\count@=\z@
- \REPEAT
+ \DT@repeat
\edef\DT@hsize{\the\hsize}%
\count@=\@nameuse{DT@level@\the\DT@countii}\relax
\dimen\z@=\count@\DT@all
@@ -185,7 +185,7 @@
\repeat
\parindent=\DT@indent
\parskip=\DT@parskip
- \DT@baselineskip=\baselineskip
+ \baselineskip=\DT@baselineskip
\let\strut\DT@strut
}
\def\DT@readarg.#1 #2. #3\@nil{%