leading update (from tds.zip)

git-svn-id: svn://tug.org/texlive/trunk@8283 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 6 insertions, 185 deletions

diff --git a/Master/texmf-dist/doc/latex/leading/README.txt b/Master/texmf-dist/doc/latex/leading/README.txt
deleted file mode 100644
index 7b5609063ba..00000000000
--- a/Master/texmf-dist/doc/latex/leading/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-___________________
-The LEADING package
-v0.2
-
-Defines the \leading{<length>} command to set the
-leading of the document to the length specified. In
-contrast with \linespread{<ratio>}, which is less
-useful in most cases.
-
-______________
-Will Robertson
-2007
diff --git a/Master/texmf-dist/doc/latex/leading/leading.pdf b/Master/texmf-dist/doc/latex/leading/leading.pdf
index 0a9618658d2..564ed2c529f 100644
--- a/Master/texmf-dist/doc/latex/leading/leading.pdf
+++ b/Master/texmf-dist/doc/latex/leading/leading.pdf
diff --git a/Master/texmf-dist/source/latex/leading/dtx-style.sty b/Master/texmf-dist/source/latex/leading/dtx-style.sty
deleted file mode 100644
index ca82efdc80b..00000000000
--- a/Master/texmf-dist/source/latex/leading/dtx-style.sty
+++ /dev/null
@@ -1,113 +0,0 @@
-\ProvidesPackage{dtx-style}
-
-\errorcontextlines=999
-
-\def\@dotsep{1000}
-\setcounter{tocdepth}{2}
-\setlength\columnseprule{0.4pt}
-\renewcommand\tableofcontents{\relax
-  \begin{multicols}{2}[\section*{\contentsname}]\relax
-    \@starttoc{toc}\relax
-  \end{multicols}}
-
-\setcounter{IndexColumns}{2}
-\renewenvironment{theglossary}
-  {\small\list{}{}
-     \item\relax
-     \glossary@prologue\GlossaryParms
-     \let\item\@idxitem \ignorespaces
-     \def\pfill{\hspace*{\fill}}}
-  {\endlist}
-
-\usepackage[svgnames]{xcolor}
-\usepackage{calc,enumitem,fancyvrb,graphicx,\jobname}
-
-\usepackage[osf,sc]{mathpazo}
-\linespread{1.069}      % A bit more space between lines
-\frenchspacing         % Remove ugly extra space after punctuation
-
-\definecolor{niceblue}{rgb}{0.2,0.4,0.8}
-\newenvironment{example}[1]
-  {\VerbatimEnvironment
-   \def\Options{#1}%
-   \begin{VerbatimOut}[gobble=4]{\examplefilename}}
-  {\end{VerbatimOut}\relax
-   \typesetexample}
-
-\def\theCodelineNo{\textcolor{niceblue}{\sffamily\tiny\arabic{CodelineNo}}}
-
-\let\examplesize\normalsize
-\let\auxwidth\relax
-
-\newlength\examplewidth\newlength\verbatimwidth
-\newlength\exoutdent   \newlength\exverbgap
-\setlength\exverbgap{1em}
-\setlength\exoutdent{-0.15\textwidth}
-\newsavebox\verbatimbox
-\edef\examplefilename{\jobname.example}
-
-\newcommand\typesetexample{\relax
-   \smallskip
-   \noindent
-   \begin{minipage}{\linewidth}
-   \color{niceblue}
-   \hrulefill\par
-   \edef\@tempa{[gobble=0,fontsize=\noexpand\scriptsize,\Options]}%
-   \begin{lrbox}{\verbatimbox}\relax
-     \expandafter\BVerbatimInput\@tempa{\examplefilename}%
-   \end{lrbox}
-   \begin{list}{}{\setlength\itemindent{0pt}
-                  \setlength\leftmargin\exoutdent
-                  \setlength\rightmargin{0pt}}\item
-   \ifx\auxwidth\relax
-     \setlength\verbatimwidth{\wd\verbatimbox}%
-   \else
-     \setlength\verbatimwidth{\auxwidth}%
-   \fi
-   \begin{minipage}[c]{\textwidth-\exoutdent-\verbatimwidth-\exverbgap}
-     \catcode`\%=14\centering\input\examplefilename\relax
-   \end{minipage}\hfill
-   \begin{minipage}[c]{\verbatimwidth}
-     \usebox\verbatimbox
-   \end{minipage}
-   \end{list}
-   \par\noindent\hrulefill
-   \end{minipage}
-   \smallskip}
-
-\newcommand*\setverbwidth[1]{\def\auxwidth{#1}}
-
-\newcommand*\name[1]{{#1}}
-\newcommand*\pkg[1]{\textsf{#1}}
-\newcommand*\feat[1]{\texttt{#1}}
-\newcommand*\opt[1]{\texttt{#1}}
-
-\newcommand*\note[1]{\unskip\footnote{#1}}
-
-\let\latin\textit
-\def\eg{\latin{e.g.}}
-\def\Eg{\latin{E.g.}}
-\def\ie{\latin{i.e.}}
-\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
-
-\def\STIX{\textsc{stix}}
-\def\MacOSX{Mac~OS~X}
-\def\ascii{\textsc{ascii}}
-\def\OMEGA{Omega}
-
-\makeatletter
-\newcounter{argument}
-\g@addto@macro\endmacro{\setcounter{argument}{0}}
-\newcommand*\darg[1]{%
-  \stepcounter{argument}%
-  {\ttfamily\char`\#\theargument~:~}#1\par\noindent\ignorespaces}
-\newcommand*\doarg[1]{%
-  \stepcounter{argument}%
-  {\ttfamily\makebox[0pt][r]{[}\char`\#\theargument]:~}#1\par\noindent\ignorespaces}
-\makeatother
-\newcommand\codeline[1]{\par\noindent\hspace{2\parindent}#1\par\noindent\ignorespaces}
-
-\newcommand\unichar[2]{\textsc{\MakeLowercase{u+#1: #2}}}
-
-\setlength\parindent{2em}
-
diff --git a/Master/texmf-dist/source/latex/leading/leading.dtx b/Master/texmf-dist/source/latex/leading/leading.dtx
index 0c23d28fee5..60522e1e7c2 100644
--- a/Master/texmf-dist/source/latex/leading/leading.dtx
+++ b/Master/texmf-dist/source/latex/leading/leading.dtx
@@ -45,10 +45,6 @@ This work consists of the file  \jobname.dtx
 \endpostamble
 \askforoverwritefalse
 \generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}}
-\generate{\file{\jobname.ins}{\from{\jobname.dtx}{batchfile}}}
-\nopreamble\nopostamble
-\generate{\file{dtx-style.sty}{\from{\jobname.dtx}{dtx-style}}}
-\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
 \Msg{*************************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
@@ -63,7 +59,12 @@ This work consists of the file  \jobname.dtx
 %</batchfile>
 %<batchfile>\endbatchfile
 %<*internalbatchfile>
+\generate{\file{\jobname.ins}{\from{\jobname.dtx}{batchfile}}}
+\nopreamble\nopostamble
+\generate{\file{dtx-style.sty}{\from{\jobname.dtx}{dtx-style}}}
+\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
 \endgroup
+\immediate\write18{mv README.txt README}
 \immediate\write18{makeindex -s gind.ist -o \jobname.ind  \jobname.idx}
 \immediate\write18{makeindex -s gglo.ist -o \jobname.gls  \jobname.glo}
 %</internalbatchfile>
diff --git a/Master/texmf-dist/source/latex/leading/leading.ins b/Master/texmf-dist/source/latex/leading/leading.ins
index e9fd8e01f51..cc59be64919 100644
--- a/Master/texmf-dist/source/latex/leading/leading.ins
+++ b/Master/texmf-dist/source/latex/leading/leading.ins
@@ -39,10 +39,6 @@ This work consists of the file  \jobname.dtx
 \endpostamble
 \askforoverwritefalse
 \generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}}
-\generate{\file{\jobname.ins}{\from{\jobname.dtx}{batchfile}}}
-\nopreamble\nopostamble
-\generate{\file{dtx-style.sty}{\from{\jobname.dtx}{dtx-style}}}
-\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
 \Msg{*************************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
diff --git a/Master/texmf-dist/tex/latex/leading/leading.sty b/Master/texmf-dist/tex/latex/leading/leading.sty
index 4fd77db9410..89f1353c153 100644
--- a/Master/texmf-dist/tex/latex/leading/leading.sty
+++ b/Master/texmf-dist/tex/latex/leading/leading.sty
@@ -11,6 +11,7 @@
 %% 
 %%   License information appended.
 %% 
+%% 
 \ProvidesPackage{leading}
   [2007/05/06 v0.2 Define leading length]
 \RequirePackage{calc}
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 7b5db3ac7dc..5e5e750f64e 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -202,7 +202,6 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'kuvio',	"die 'skipping, nonfree license'",
  'latex-veryshortguide', "die 'skipping, nosell license'",
  'latexmp',	"&MAKEflatten",
- 'leading',	"&MAKEleading",
  'leawood',	"&MAKEflatten",
  'lettre',	"&MAKEflatten",
  'lexitex',	"die 'skipping, camel has replaced'",
@@ -424,7 +423,6 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'interactiveworkbook'	=> '&POSTinteractiveworkbook',
  'inversepath'		=> '&POSTinversepath',
  'koma-script'          => '&POSTkoma',
- 'leading'		=> '&POSTleading',
  'pgf'			=> '&POSTpgf',
  'pst-cox'		=> '&POSTpstcox',
  'xecyr'		=> '&POSTxecyr',
@@ -2561,56 +2559,6 @@ sub MAKEFAQen
 }
 
 # Almost donormal() but .ins overwites itself... Wrote to Will (2008/04/15)
-sub MAKEleading {
-   print "doing MAKE$package... \n"
-   &setup;
-   chdir("$DEST/doc/$whichdocformat/$package");
-   &buildfilelist;
-
-   ## save the original .ins
-   &SYSTEM ("$CP $package.ins $package.ins.ori");
-
-   # run the .ins files (if any) supplied
-   $inspatt = $specialins{$package} || $standardins;
-   $Foundry = $specialfoundry{$package} || $standardfoundry;
-   &runins($inspatt);
-
-   ## restore the original .ins
-   &SYSTEM ("$MV $package.ins.ori $package.ins");
-
-   # rebuild the list of files in the directory
-   &buildfilelist;
-   
-   if ($Foundry eq "metafont") {
-     &dosimplemf;
-   } else {
-     &domf;
-   }
-   
-   &dodvi;
-   # rebuild again, as we have .dvi files now
-   &buildfilelist;
-   &dobst;
-   &domp;
-   &dobib;
-   &doxmt;
-   &dotex;
-   &runfonts;
-   &domakeindex;
-   &doomega;
-   &dosource;
-   &dotype1;
-   &doscripts;
-
-   # remove empty directories that we never used.
-   &SYSTEM ("rmdir $DEST/*/$whichformat/$package 2>/dev/null");
-
-   &killfiles ($specialclean{$package} || $standardclean);
-   my $postaction = $specialpostaction{$package};
-   eval ($postaction) if $postaction;
-}
-
-# Almost donormal() but .ins overwites itself... Wrote to Will (2008/04/15)
 sub MAKEinversepath {
    print "doing MAKE$package... \n"
    &setup;