[latex3-commits] [l3svn] branch master updated: Remove remainder of older test set up

noreply at latex-project.org noreply at latex-project.org
Sun Sep 13 22:08:15 CEST 2015


This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

The following commit(s) were added to refs/heads/master by this push:
       new  5ff4b36   Remove remainder of older test set up
5ff4b36 is described below

commit 5ff4b369a3bc2434fa0163c73b2fe48e5ca4adc7
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Sep 13 21:04:51 2015 +0100

    Remove remainder of older test set up
    
    None of this is now working/used (only xor form xpackages has
    tests, and they already use l3build). This stuff is therefore
    just confusing, and is of course in the history if required.
---
 .gitattributes                        |   14 --
 support/log2tlg                       |  117 ---------
 validate/commands-check.tex           |   47 ----
 validate/readme.val                   |  101 --------
 validate/regression-test-suite.tex    |  364 ----------------------------
 validate/testing.tex                  |  424 ---------------------------------
 xpackages/Makefile                    |  177 --------------
 xpackages/galley/Makefile             |  204 ----------------
 xpackages/galley/make.bat             |  135 -----------
 xpackages/make.bat                    |  222 -----------------
 xpackages/xcontents/Makefile          |  302 -----------------------
 xpackages/xcontents/make.bat          |  101 --------
 xpackages/xfootnote/Makefile          |   22 --
 xpackages/xfootnote/make.bat          |  135 -----------
 xpackages/xfrontm/Makefile            |  301 -----------------------
 xpackages/xfrontm/make.bat            |  146 ------------
 xpackages/xhead/Makefile              |  302 -----------------------
 xpackages/xhead/firstattempt/Makefile |   22 --
 xpackages/xhead/firstattempt/make.bat |  135 -----------
 xpackages/xhead/make.bat              |  241 -------------------
 xpackages/xinitials/Makefile          |  302 -----------------------
 xpackages/xinitials/make.bat          |  135 -----------
 xpackages/xlang/Makefile              |   41 ----
 xpackages/xlang/make.bat              |  146 ------------
 xpackages/xlists/Makefile             |  302 -----------------------
 xpackages/xor/Makefile                |  291 ----------------------
 xpackages/xor/make.bat                |  320 -------------------------
 xpackages/xtheorem/Makefile           |   22 --
 xpackages/xtheorem/make.bat           |  135 -----------
 29 files changed, 5206 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 14809e4..de24432 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,17 +1,3 @@
 * text=auto !eol
 l3experimental/xcoffins/elementare-typographie-title.jpg -text svneol=unset#image/jpeg
 l3kernel/expl3-datatype-analysis.xlsx -text
-xpackages/galley/make.bat -text
-xpackages/make.bat -text
-xpackages/xcontents/Makefile -text
-xpackages/xcontents/make.bat -text
-xpackages/xfootnote/make.bat -text
-xpackages/xfrontm/make.bat -text
-xpackages/xhead/firstattempt/Makefile -text
-xpackages/xhead/firstattempt/make.bat -text
-xpackages/xhead/make.bat -text
-xpackages/xinitials/make.bat -text
-xpackages/xlang/make.bat -text
-xpackages/xor/xo-balance.pdf -text
-xpackages/xor/xo-pfloat.pdf -text
-xpackages/xtheorem/make.bat -text
diff --git a/support/log2tlg b/support/log2tlg
deleted file mode 100644
index 909dfe4..0000000
--- a/support/log2tlg
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/local/bin/perl
-
-if ($#ARGV != 0) {
-    die "Usage: log2tlg basename";
-}
-
-$BASE = shift;
-
-
-$skipping = 0;
-$skip_autoload = 0;
-
-$LTOPDIR = $ENV{'LTOPDIR'};
-
-#
-# skip everything until START-TEST-LOG is seen
-#
-
-while (<>) {
-    /^START-TEST-LOG/ && last;
-}
-
-
-while (<>) {
-    # if END-TEST-LOG is seen, terminate
-    /^END-TEST-LOG/ && last;
-
-    # if OMIT is seen, skip until TIMO
-    if (/^OMIT/) {
-	$skipping++;
-	next;
-    } elsif (/^TIMO/) {
-	$skipping--;
-	next;
-    }
-
-    next if $skipping;
-
-    # if environment variable LTOPDIR is set, replace beginning of paths
-    if ($LTOPDIR) {
-        s#$LTOPDIR/latex2/#../../#g;
-    }
-
-#    s/$BASE(\.lvt)?//og;
-    s/(\.\/)?$BASE//og;
-
-    # if we are running the autoload test suite, the environment variable
-    # TLG_PREFIX is set
-
-    if ($ENV{'TLG_PREFIX'}) {
-
-	if ($skip_autoload) {
-	    /^\)/ && ($skip_autoload = 0);
-	    next;
-	} elsif (/^(.*)\(auto(err|fss1|out1|pict|tabg)\.sty$/) {
-	    $skip_autoload = 1;
-	    ($_ = $1) =~ s/\s+$//;
-	    $_ = "$_\n";
-	}
-
-    }
-
-    # skip filedate lines
-    /[^<][0-9][0-9][0-9][0-9]\/[0-9][0-9]\/[0-9][0-9]/ && next;
-
-    # skip ident lines from .fd files
-    if (/\([^ ]*fd/.../^[ ]*\)/) {
-        next;
-    }
-
-
-    # skip \openin/\openout lines in web2c 7.x
-    if (/^\\open(in|out)\d+ = /) {
-	# skip empty line
-	$_ = <>;
-	next;
-    }
-
-    # remove messy DOS CR at end of line
-    s/\r+$//;
-
-    # zap ./ at begin of filename
-    s/\(\.\//\(/g;
-
-    # change err message of older pdfTeX which doesn't know so many dimensions ...
-    s/cm, mm, dd, cc, bp, or sp/cm, mm, dd, cc, nd, nc, bp, or sp/g;
-    
-    # Normalise a case where fixing a TeX bug changes the message text
-    s/\\csname\\endcsname /\\csname\\endcsname/g;
-
-    # zap "on line <num>" and replace with "on line ..."
-    s/on line [0-9]*/on line \.\.\./g;
-
-    # zap <num> on various allocations
-    # s/=\\box[0-9]*/=\\box\.\.\./;
-    # s/=\\count[0-9]*/=\\count\.\.\./;
-    # s/=\\dimen[0-9]*/=\\dimen\.\.\./;
-    # s/=\\muskip[0-9]*/=\\muskip\.\.\./;
-    # s/=\\skip[0-9]*/=\\skip\.\.\./;
-    # s/=\\toks[0-9]*/=\\toks\.\.\./;
-
-    # zap "[1{/.../pdftex.map}]"
-    s/\[1\{[\w\/\-]*\/pdftex\.map\}\]//;
-    
-    # Zap, at present, direction info in LuaTeX logs
-    s/\, direction TLT//;
-    
-    # Remove spaces at the start of lines (normalises LuaTeX vs pdfTeX/XeTeX)
-    s/^\s+//;
-    
-    # Use only four decimal places for glue set lines (some LuaTeX
-    # cases vary in the last digit)
-    s/glue set (\d+.\d{4})\dfil/glue set \1fil/;
-
-    # do not print empty lines
-    print if ! /^\s*$/;
-}
diff --git a/validate/commands-check.tex b/validate/commands-check.tex
deleted file mode 100644
index 17d631b..0000000
--- a/validate/commands-check.tex
+++ /dev/null
@@ -1,47 +0,0 @@
-%
-% Execute this TeX file with
-% latex -interaction=batchmode commands-check
-%
-% The package loaded and the commands checked can be customised:
-\providecommand\PKG{expl3}
-\providecommand\CMDS{commands-check.cmds}
-
-\documentclass{minimal}
-\usepackage{\PKG}
-\makeatletter
-
-% "loop...if...then...repeat" from TeX by Topic:
-\def\cmdchk at loop#1\cmdchk at repeat{\def\cmdchk at body{#1}\cmdchk at iterate}
-\def\cmdchk at iterate{%
-  \let\cmdchk at next\relax
-  \cmdchk at body \let\cmdchk at next\cmdchk at iterate \fi \cmdchk at next}
-
-\let \@tempb \@empty
-\newread \cmdchk at read
-\openin \cmdchk at read \CMDS \relax
-
-\def\checkcmds{%
-  \begingroup
-    \catcode`\\=12
-    \endlinechar=-1
-    \loop
-      \read \cmdchk at read to \@tempa \relax
-      \ifx \@tempa \@empty
-        \closein \cmdchk at read
-      \else
-        \if !\expandafter \@car \@tempa \@nil
-          \xdef \@tempb
-            {\@tempb ^^J!>\space\space\space\expandafter\@gobble\@tempa}%
-        \fi
-    \repeat
-  \endgroup
-  \ifx\@tempb\@empty\else
-    \nonstopmode
-    \errmessage{\@tempb^^J}%
-    \batchmode
-  \fi
-}
-\makeatother
-\begin{document}
-\checkcmds
-\end{document}
diff --git a/validate/readme.val b/validate/readme.val
deleted file mode 100644
index 8b3cdde..0000000
--- a/validate/readme.val
+++ /dev/null
@@ -1,101 +0,0 @@
-
-This is the original readme file of the LaTeX 2.09 validation package (which
-was never widely published or distributed) but which was used extensively for
-regresion tests for LaTeX (and later after updating for LaTeX2e).
-
-I placed it here as I indent to build a publically available version for both
-LaTeX2e and expl3 fairly soon and need a place to keep the files.
-
-What is here right now will not work out of the box
-
-frank  2008-09-14
-
-
------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-This file is part of the validate package.
-------------------------------------------
-
-\def\filedate{92/06/28}
-
-Copyright (C) 1992 by David Carlisle, Frank Mittelbach.
-All rights reserved.
-
-IMPORTANT NOTICE:
-
-You are not allowed to change this readme file.
-
-This package contains the tools and the documentation of the automated
-validation system for changes to LaTeX2.09.
-
-The purpose of this system is to detect errors introduced by bug fixes
-to the official LaTeX before such changes are distributed. For more
-details see the documentation.
-
-The quality of the automated checking system depends largely on the
-number of test files in it. Therefore we are constantly looking for
-additional test files to make the system even better.
-
-If you got this package you have probably volunteered to help us in
-writing new test files. Nevertheless, if you ran into the package by
-chance you are nevertheless invited to help :-)
-
-You should get the following files:
-
-checktlg	UNIX script to check a test file against its
-		``hand-checked'' test output from an earlier run
-		(a so called tlg file).
-
-maketlg		UNIX script to generate a tlg file from a test file.
-
-readme.val	This file.
-
-test209.tex	A file containing a set of helper commands for use
-                in test files.
-
-testing.ltx	The documentation on how to write and check test
-                files.
-
-tlen01.lvt	A sample test file (lvt stands for LaTeX validation
-                test)
-
-tlen01.tlg	The output from the sample test file.
-
-tarr2.lvt	A second sample file testing some bugs that showed up
-                in release of array.sty.
-
-tarr2.tlg	The output from the second sample file.
-
-
-Please run the documentation file `testing.ltx' through LaTeX to get
-some more detailed information about the procedures and concepts
-behind this system.
-
-If you have written and tested some new test files please submit them
-to the following address for inclusion into the system:
-
-Frank Mittelbach  <mittelbach at vzdmza.zdv.uni-mainz.de>
-
-Thanks for your work.
-
-The \fileversion and \filedate lines below are generated so that you
-can easily check differences to your version by using diff etc.
-
-
-        readme.val:      \filedate{92/06/28}
-        test209.tex:     \fileversion{v1.0a}
-        test209.tex:     \filedate{92/06/28}
-        testing.ltx:     \fileversion{v1.0a}
-        testing.ltx:     \filedate{92/06/28}
diff --git a/validate/regression-test-suite.tex b/validate/regression-test-suite.tex
deleted file mode 100644
index de40aa3..0000000
--- a/validate/regression-test-suite.tex
+++ /dev/null
@@ -1,364 +0,0 @@
-%		tb57mitt.ltx
-\documentclass{ltugboat}
-
-%\usepackage[T1]{fontenc}
-\DeclareTextSymbol{\textbackslash}{OT1}{`\\}
-
-\hyphenation{Mass-a-chu-setts}
-
-\usepackage{calc}
-\usepackage{shortvrb}
-\MakeShortVerb\|
-
-\begin{document}
-
-\title{A regression test suite for \LaTeXe}
-
-\author{Frank Mittelbach}
-\address{\LaTeX3 project}
-\netaddress{Frank.Mittelbach at eds.com}
-
-
-\maketitle
-
-\begin{abstract}
-  This paper describes the history of the development of a regression
-  test suite for \LaTeX{} and its importance for the release of stable
-  and reliable future distributions of that software.
-  A more detailed description of the concepts and the
-  implementation of the test suite will be given in~\cite{tub:xxx}.
-%  It carries on
-%  with describing the concepts and the implementation of this suite
-%  showing some examples how to provide additional test files within
-%  this scheme.
-
-  As experience shows that there can't be enough test files in such a
-  suite, we make a plea to the \TeX{} community to help us in making
-  \LaTeX{} distributions even more reliable by joining a new volunteer
-  group working on the task of updating and adding to this suite.
-\end{abstract}
-
-
-\section{Introduction}
-
-Back in 1992 when the \LaTeX3 team took over maintenance of \LaTeX{}
-and started to work on the current \LaTeX{} version~\cite{A-W:LLa94},
-also known as \LaTeXe{}, I had the idea of producing a test
-environment for \LaTeX{} that would help us in providing stable and
-reliable distributions. My idea originated in the
-\texttt{trip} test for the \TeX{} program~\cite{Knuth:1984:TTT}, a
-fixed test file which is run through \TeX{}, containing code that tries
-to exercise as many boundary cases as Don Knuth could think of.  The
-output of this run is then compared with a set of files certified by
-Don to contain the correct information. Only if a new implementation
-of the \TeX{} program produces the same output (with well defined minor
-%derivations in certain places) is it allowed\footnote{An additional
-deviations in certain places) is it allowed\footnote{An additional
-requirement according to the \texttt{trip} test documentation is that
-the author of the \TeX{} implementation has to be satisfied with the
-product. In other words, a simple program that throws away all its
-input and always output the files needed to satisfy the \texttt{trip}
-test would be allowed to call itself \TeX{} as long as the author of
-that program is happy with it.} to be called \TeX{}.  The idea behind
-this is to ensure that \TeX{} behaves identically on all
-implementations and the \texttt{trip} test was the measure proving
-this.
-
-With \LaTeX{} the idea was not to ensure that it is identical on all
-%platforms---this is automatically the case if the standard
-platforms\Dash this is automatically the case if the standard
-installation is obtained and the installation procedures are
-%applied---but to ensure that that new releases of \LaTeX{} do not
-applied\Dash but to ensure that that new releases of \LaTeX{} do not
-inadvertently modify the behavior of commands.  Since \LaTeX{} is a
-large and complex system, this is definitely a non-trivial
-task: in `fixing' one bug, it is often necessary to modify the
-definitions of several `internal' commands, and these may in turn
-affect many other commands which have no obvious connection with the
-original problem.
-
-We have had some pretty disastrous experiences of this type, often
-finding that harmless looking corrections had effects on what seemed,
-at first glance, completely unrelated areas. This is in part due to
-the fact that \LaTeX{} is based on the macro language of \TeX{}, which
-allows reuse and redefinition of arbitrary code fragments.
-
-\begin{figure*}
-\centering
-\setlength\fboxsep{5pt}
-\fbox{\begin{minipage}{\linewidth-3em}
-\newcommand{\timeestimate}[1]{\par \smallskip\noindent
-  {\it Estimated time required:}
-  #1.\par}
-
-\newcommand{\task}[1]{\textbf{#1}\par\vspace*{3pt}}
-\newcommand{\coordinator}[1]{\par\smallskip
-  \noindent{\it Coordinator\/} [#1]:\volunteer}
-
-\newcommand{\othervolunteers}{\par\noindent{\it Other volunteers:}}
-\newcommand{\volunteer}[1]{\par#1\quad \ignorespaces}
-
-\newcommand{\email}{\begingroup \catcode`\%=12 \xemail}
-%    Auxiliary function for \email. It applies \meaning to the
-%    argument to make all the characters category 12.
-\newcommand{\xemail}[1]{\def\temp{#1}\tt
-  \expandafter\xmeaning\meaning\temp\xmeaning\endgroup}
-%    Auxiliary function for \xemail. \newcommand cannot be used here.
-\def\xmeaning#1->#2\xmeaning{#2}
-
-
-\task{Validating \protect\LaTeX 2.09}
-Writing test files for regression testing: checking bug fixes and
-improvements to verify that they don't have undesirable
-side effects; making sure that bug fixes really correct the problem
-they were intended to correct; testing interaction with
-various document styles, style options, and environments.
-
-We would like three kinds of validation files:
-\begin{enumerate}
-\item General documents.
-\item Exhaustive tests of special environments/modules such as tables,
-displayed equations, theorems, floating figures, pictures, etc.
-\item Bug files containing tests of all bugs that are supposed to be
-fixed (as well as those that are not fixed, with comments about their
-status).
-\end{enumerate}
-
-A procedure for processing validation files has been devised; details
-will be furnished to anyone interested in this task.
-
-\timeestimate{2 to 3 weeks, could be divided up}
-
-\coordinator{25 August 1992}{Daniel Flipo}
-                         \email{flipo at citil.citilille.fr}
-\othervolunteers
-\volunteer{Chris Martin} \email{cs1cwm at sunc.sheffield.ac.uk}
-
-\end{minipage}}
-\caption{An excerpt from the volunteer task list 1993}
-\label{fig:voltask}
-\end{figure*}
-
-For that reason we started working on a concept for automated tests to
-detect such problems. When that system was
-available,
-we asked for volunteers to help us in building up a suitable test suite
-for \LaTeX{} (which at that time was \LaTeX~2.09). Part of the rationale
-behind this work was to ensure that a future transition from
-\LaTeX~2.09 to \LaTeXe{} (for which development was under way) would
-become as painless as possible, i.e., these tests were also supposed
-to ensure that the new code for \LaTeXe{} would not change the user
-interface behavior without detection.
-
-This approach seems to us to have been very successful; this is in
-large parts due to the quality and quantity of the work of the
-volunteers helping us at that time, in particular Daniel Flipo and
-Chris Martin. Figure~\ref{fig:voltask} shows an excerpt from the
-volunteer task list from 1993 describing this task (and my rather
-optimistic time requirements for it).
-
-When \LaTeXe{} was released for the first time in 1994 we updated the
-regression test support macros and tried to improve the test suite by
-adding new test files when we fixed bugs or when we added new
-functionality to \LaTeX. However, being human, we have not followed
-this practice as rigorously as we should have: especially since the
-first releases it has become more and more common for us to fix a small
-bug without spending the additional time necessary to also write a
-test file that exhibits the correct behavior.
-
-Today our test suite has about 300 test files which are automatically
-executed and compared before a new release hits the streets. And
-indeed, these test files have saved us from embarrassment many times
-already.
-
-\section{This year's boo-boos!}
-%\section[Chris' boo-boos!]{Chris'
-% boo-boos!\footnotemark}\footnotetext{I don't feel responsible for this
-% section title: It was added by the man himself (while looking the paper
-% over), even though neither of the described problems were entirely his fault.}
-
-However, results show that such a suite can never be large enough to
-avoid the need for a patch release once in a while.  It is
-particularly important that new
-features, such as the release of additional files or the correction of
-recently found bugs, get tested and frozen within this suite so that
-there is no unexpected change later on.  For example, with the December
-1997 release we added the packages \texttt{calc} and \texttt{textcomp}
-to the distribution but, due to time constraints, did not add to the suite
-additional test files designed to exercise these packages;
-and, by Murphy's law, \texttt{textcomp} did not contain a necessary
-|\ProvidesPackage| command, with the result that it claimed to be
-written for a future release\footnote{The technical reason for this
-  behavior, for those who wonder, was that the release date of the
-  package, which is an optional argument to the (missing)
-  \texttt{\textbackslash
-    ProvidesPackage} command, was there but was mistakenly picked up the
-  \texttt{\textbackslash NeedsTeXFormat} which then produced a warning
-  as the release date of \texttt{textcomp} was later than the nominal
-  release date (of 1997/12/01) for the format of the
-%  distribution.}---something that would have been caught by any test
-  distribution.}\Dash something that would have been caught by any test
-file exercising the package.
-
-Another embarrassing example of a missing test file in that release
-was the |\t| error.  To better support language files from the Babel
-suite, some of which make the |"| character active, we changed all
-internal definitions of characters and accents from
-hexadecimal notation, such as |"7F|, to decimal, i.e., to |127| in that case.
-Unfortunately in the definition for |\t| we did this wrong and |"7F|
-became |79|, giving very strange effects when the accent was
-used.\footnote{Both errors got found and reported several times within
-  two days after the release, so the patch release came out quite
-  quickly this time.} An error like this would have been automatically
-caught if we had, for each output encoding, a test file to
-check that each definition in the encoding results in the `right' glyph or
-glyphs.
-
-
-\typeout{WARNING: **** hardwired new page ****}\newpage
-
-\section{Call for volunteers}
-
-Thus to make the \LaTeX{} system even more reliable we call on you for
-help! What we hope to find is a new group of volunteers that is
-interested in working on an extension of the \LaTeX{} test suite
-system. There is no need to be an expert \TeX{} or \LaTeX{} programmer
-for this task though some experience with \LaTeX{} and its inner
-workings will be necessary.
-
-\begin{center}
-\fbox{\begin{minipage}{\linewidth-2em}
-  \bfseries If you are interested in joining this effort, please
-  contact Daniel Flipo at
-\begin{center}
-  \texttt{Daniel.Flipo at univ-lille1.fr}
-\end{center}
-  who kindly agreed to act as a coordinator between the individual
-  volunteers.
-\end{minipage}}
-\end{center}
-
-
-
-
-There are a number of areas in which further test files would improve
-the system enormously. They are outlined in the following sections.
-
-\subsection{Testing existing interfaces}
-
-Testing existing interfaces is a very important task, one not so far,
-for several reasons, adequately covered by the test suite. This will
-not only help us to detect problems when fixing errors in \LaTeX{}
-but, more importantly, it will help one day in the transition to a
-new system since these test files will then clearly identify which
-interfaces are compromised (deliberately or by mistake) by the new
-system. This in turn will then help to produce, if necessary,
-procedures to automatically translate source documents from \LaTeX{}
-to its successor.
-
-What we are looking for are test files that describe and test the
-current interfaces on all levels. This is certainly an ambitious task,
-but perhaps also one of the most interesting and rewarding ones within
-this list.
-
-\subsection{Testing corrected bugs}
-
-As described above, several of the bugs reported to us have been fixed and a
-test file showing the correct behavior has been added. But for many
-this is not the case.
-
-What we are looking for is the provision of test files for all bugs reported
-and fixed, so that future releases will not by mistake revert any of
-these fixes without
-% alarming : nice one, get it?  not quite the same as:
-alerting the maintainers.  This means working through our bug
-database and devising test files showing the correct behavior. As we
-ask submitters of bug reports to send in a test file that shows the
-incorrect behavior, and they usually do so, it is often possible to
-start from the submitted file and modify it slightly so that it fits into
-the regression suite concepts.
-
-
-\subsection{Testing new extensions}
-
-What is important for the kernel interfaces is also important for the
-core packages and extensions: these interfaces should be exercised in
-such a way that any future changes will be automatically detected. Again
-this provides interesting mental exercise since it isn't always easy
-to decide what is pertinent for the interface and how to exercise it
-so that enough (but not too much) information ends up in the
-\texttt{.log} file.
-
-
-\subsection{Testing contributed packages}
-
-A final area which is important is the testing of packages which lie
-outside the control of the \LaTeX{} maintainers. Although we cannot
-in all cases guarantee that corrections to the kernel software
-will not harm any such package, we are, of course, very much concerned
-to avoid making any change that makes third party packages
-invalid. In the past, whenever we noticed (or even suspected)
-such a problem we tried either to avoid it, by choosing a different
-solution, or, if that was not possible for some reason, to find the
-maintainers of the package and give them notice of a possible
-clash so that such problems could be avoided.
-
-There is a problem with testing the interfaces of third party packages:
-changes by the package author, to either the interface or the
-implementation of the package, can upset the test suite as easily as
-can changes to the \LaTeX{} kernel by the \LaTeX3 project team.  Thus,
-to avoid our limited time resources being used up in chasing after
-errors introduced in this way (being neither our fault nor being
-correctable by us), it would be necessary to develop clear protocols for
-how this part of the test suite should be maintained, e.g., what
-requirements a package must fulfill to be included into it, what
-obligations an author of such a package agrees to, etc. This is not
-yet done and so it is part of the volunteer effort.
-
-\smallskip
-
-We close our plea for help with a quote taken
-from~\cite{Knuth:1984:TTT} which shows how the Grand Wizard sees the
-task of writing such test files (which does not mean you have to follow
-his advice):
-%\noindent
-%\fbox{\begin{minipage}{\linewidth-2\fboxrule-2\fboxsep}
-\begin{quote}
-\setlength\rightskip{0pt plus 2em}
-To write such a fiendish test routine, one simply gets into a nasty frame
-of mind and tries to do everything in the unexpected way. Parameters
-that are normally positive are set negative or zero; borderline cases
-are pushed to the limit; deliberate errors are made in hopes that the
-compiler will not be able to recover properly from them.\\
-\mbox{}\hfill\slshape Donald Knuth 1984
-\end{quote}
-%\end{minipage}}
-
-
-
-
-\begin{thebibliography}{1}
-\bibitem{tub:xxx}
-David Carlisle and Frank Mittelbach.
-\newblock \emph{The \LaTeX{} regression test suite: concepts and
-implementation}.
-%\newblock To appear in \TUB{} \ldots
-\newblock \TUB{}; to appear.
-
-\bibitem{Knuth:1984:TTT}
-Donald~E. Knuth.
-\newblock A torture test for {\TeX}.
-\newblock Report STAN-CS-84-1027, Stanford University, Department of Computer
-  Science, Stanford, CA, USA, 1984.
-
-\bibitem{A-W:LLa94}
-Leslie Lamport.
-\newblock {\em {\LaTeX:} A Document Preparation System}.
-\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
-
-\end{thebibliography}
-
-\makesignature
-
-\end{document}
-
diff --git a/validate/testing.tex b/validate/testing.tex
deleted file mode 100644
index 7066649..0000000
--- a/validate/testing.tex
+++ /dev/null
@@ -1,424 +0,0 @@
-%
-%
-%
-\typeout{ABSOLUTELY UNFINISHED!!!!!}
-%
-
-\documentclass[final]{ltugboat}
-\usepackage{shortvrb}
-\MakeShortVerb{|}
-\usepackage{calc}
-
-% \verbfile{<name>} to input a possibly long file verbatim
-%
-\makeatletter
-\def\verbfile#1{\begingroup
-  \footnotesize
-  \@verbatim
-  \frenchspacing \@vobeyspaces
-  \@input{#1}\endtrivlist\endgroup\@doendpe}
-\makeatother
-
-%\setcounter{secnumdepth}{-1}
-
-\title{The \LaTeX{} regression test suite: concepts and
-implementation}
-
-\author{D. P. Carlisle \and  F. Mittelbach}
-
-\begin{document}
-\maketitle
-
-\begin{abstract}
-  This paper describes the concepts and the implementation of a
-  regression test suite for \LaTeX{}. A general overview about the
-  history behind this package is given in~\cite{tub:xxx}.
-
-  As experience shows that there can't be enough test files in such a
-  suite we make a plea to the \TeX{} community to help us making
-  \LaTeX{} distributions even more reliable by joining a new volunteer
-  group working on the task of updating and adding to this suite.
-\end{abstract}
-
-\section{Aims of this Package}
-This set of files implements a scheme suggested by Frank Mittelbach
-for ensuring that new releases of \LaTeX{} do not inadvertently modify
-the behaviour of commands. This is definitely a non-trivial task, as
-\LaTeX{} is a large system, and in `fixing' one bug, one often needs
-to modify the definitions of several `internal' commands, which may
-affect many other commands which have no obvious connection with the
-original problem.
-
-\section{The Basic System}
-The idea is to have a suite of test files, each one exercising a
-particular set of related commands. These should be called in such a
-way that one can tell from the \texttt{.log} file (not the \texttt{.dvi}
-file) that the command has `met its specification'. The \texttt{.log}
-file is then edited to remove certain irrelevant information and will
-then be stored, as a \texttt{.tlg} file. Before a new release is issued,
-all the test files will be run through the new version, and the
-resulting \texttt{.tlg} files will be automatically compared with the
-saved original versions. Any tests which do not produce identical
-results will then be notified to the maintainer of
-\LaTeX, who can visually compare the \texttt{.tlg} files to see whether the
-differences are due to an `improvement' or are the result of a newly
-introduced bug!
-
-To distinguish test files from other files they have to have the
-extension \texttt{.lvt} (standing for \LaTeX{} validation test).
-
-
-\section{The Format of a Test File}
-
-If the functions to be tested need to be called inside the \LaTeX{}
-\texttt{document} environment, then start the file as usual with:
-\begin{verbatim}
-\documentclass{article}
-\begin{document}
-\end{verbatim}
-or any other class. In some cases you may also want to load some
-packages if they are need for your test.
-
-If you are testing some commands of the commands from \LaTeX`s kernel,
-then these lines may be omitted.
-
-Then start the test procedure with
-\begin{verbatim}
-\input{regression-test}
-\START
-\end{verbatim}
-Everything in the \texttt{.log} file before this will be omitted,
-\verb|\START| also prints a character table in the \texttt{.log} file,
-so that the \texttt{.tlg} file may be checked for errors caused be
-faulty email connections.%
-\footnote{In this day and age, this precaution is probably unnecessary in
-its current implementation, but as we start to include tests for unicode
-behaviour it will again be of importance.}
-After \verb|\START|, the \texttt{@} sign is
-set up to act as a letter, so you can use any commands that can
-normally only be used in a package or class file.
-
-If you like you can identify yourself as the original author of this
-test file by issuing the following commands.
-\begin{verbatim}
-\AUTHOR{my name}
-\ADDRESS{my email address}
-\end{verbatim}
-This will help us to get back to you later if necessary.
-
-You should then declare the format that you are using, the class, and
-any packages that you have input. This should include dates and/or
-version numbers, so that if at some future time, the test fails, any
-differences between the original versions and the new versions can be
-checked, to find the cause of the failure.
-
-This is important as
-not all packages declare themselves to the log file, and we can not
-rely on \TeX's output as it includes full path names, and does not
-include version numbers etc.%
-\footnote{Is this still true now that we have \texttt{\string\listfiles}?}
-So for each package included give a
-declaration like:
-\begin{verbatim}
-\FORMAT{LaTeX2e <1997/12/01> patch level 1}
-\CLASS[a4paper]{article 1996/10/31 v1.3u}
-\PACKAGE{ifthen 1996/08/02 v1.0m}
-\PACKAGE[dvips]{graphics 1996/10/31 v1.0c}
-\PACKAGES{array 1996/06/14 v2.3i}
-\end{verbatim}
-
-You may then optionally `declare' a collection of commands that make
-up the `module' that you are testing.  \verb|\DECLARECOMMAND\foo| will
-report whether \verb|\foo| is defined, undefined, or equivalent to
-\verb|\relax|.  Note that you may also declare commands which are not
-currently defined in \LaTeX, but which might be added. The system will
-then pick up the addition of such a command, and remind the
-maintainers to announce that there has been a change in the user
-interface. Thus if you were testing the \texttt{array} environment,
-you might want to declare \verb|\extrarowheight| (currently defined in
-the \texttt{array} package) or \verb|\hhline| (currently defined in
-the \texttt{hhline} package).  Note that you would not declare
-\verb|\@tabularcr|, as this is an internal command, and the fact that
-it is undefined in the \texttt{array.sty} version does not constitute
-a change in the interface.
-
-After that you may have any series of \LaTeX{} commands, these should
-be called in such a way that any incorrect behaviour would show up in
-the \texttt{.log} file. For example, an expandable command could be tested
-by executing it inside a \verb|\typeout| command; an un-expandable command
-could be tested storing its result in a macro and applying the \verb|\show|
-command.
-
-Two commands are provided to assist this process called |\TEST| and
-|\TESTEXP|, although their use is, strictly speaking, optional. Both keep
-track of a running test number, and print clear separators in the |.log|
-between each test. They take two arguments: the first is printed verbatim
-in the |.log| file; here you can describe the test and possibly duplicate
-the expected outcome to make it easier to see where things are going wrong
-when the test fails. The second argument executes (within a group) the test
-itself. These commands will be described in more detail in
-section~\ref{sec:testmacro}.
-
-Any commands, such as those allocating registers, which produce lines
-in the \texttt{.log} file, which you do not want to be considered as part
-of the test, you should surround with the declarations \verb|\OMIT|
-and \verb|\TIMO|.
-
-Finally the file should finish with either \verb|\END|, or
-\verb|\end{document}|. Only use the second form if you actually need to
-close the \texttt{document} environment, say to get the \texttt{.aux} files
-correct.
-
-An example of a test file to demonstrate these commands is shown in
-Figure~\ref{fig:minimaltest}, with the relevant parts of the |.log| file
-due to the tests shown in Figure~\ref{fig:minimallog}.
-
-\begin{figure}
-\begin{verbatim}
-\documentclass{minimal}
-\input{regression-test}
-\begin{document}
-\START
-\AUTHOR{Frank Mittelbach}
-\TEST{\g at addto@macro, expect "aaabbb"}{
-  \def\ab{aaa}
-  \g at addto@macro\ab{bbb}
-  \show\ab
-}
-\TEXTEXP{\@car, expect "YES"}{
-  \@car \YES \ERROR \@nil
-}
-\END
-\end{verbatim}
-\caption{An minimal example of a test suite document.}
-\label{fig:minimaltest}
-\end{figure}
-
-\begin{figure}
-\fontsize{7pt}{8pt}
-\begin{verbatim}
-============================================================
-TEST 1: \g at addto@macro , expect "aaabbb"
-============================================================
-> \ab=macro:
-->aaabbb.
-<argument> ... \g at addto@macro \ab {bbb} \show \ab
-
-l.10 }
-
-============================================================
-
-============================================================
-TEST 2: \@car , expect "YES"
-============================================================
-YES
-============================================================
-\end{verbatim}
-\caption{Truncated output from running the test file shown in
-         Figure~\ref{fig:minimaltest}.}
-\label{fig:minimallog}
-\end{figure}
-
-\section{Tips}
-The test should be written to show that the command meets its
-specification. Ideally it should not fail if the command is correctly
-re-implemented in a different way. This means that the primitive tracing
-facilities like \verb|\tracingmacros| and \verb|\tracingcommands| should
-probably not be used, as these reveal the implementation details of the
-command.
-
-If the command involves visual formatting, one way to get information
-into the \texttt{.log} file is to do all the commands inside
-\verb|\setbox0=\vbox{...}|, and then \verb|\showbox0|. Before showing
-the box you should set \verb|\showboxdepth| and \verb|\showboxbreadth|
-to suitable values so that just the right amount of information
-displayed. \LaTeX{} has a command called \verb=\showoutput= which can
-be of some help here.
-
-\verb|\tracingoutput| or \verb|\tracingpages| might also be used (with
-care), say if you were testing section headings at the top and bottom
-of pages.  Other useful commands are \verb|\typeout{\meaning...}|,
-which is like
-\verb|\show|, but puts less junk in the \texttt{.log} file, and
-\verb|\typeout{\the...}|, which is like \verb|\showthe|.
-
-Please remember that it isn't sufficient to produce a test file that
-shows the desired behavior in the {\tt.dvi} file since this file will
-not be inspected by the test system later on. Nevertheless, it is
-often helpful to check the {\tt.dvi} when creating a test file but you
-have to make sure that the relevant information is also displayed in
-the {\tt.tlg} in the end.
-
-\section{The \texttt{\string\TEST} and \texttt{\string\TESTEXP} macros}
-\label{sec:testmacro}
-
-These macros are recommended for structuring the test file into logical
-pieces. As mentioned earlier, it is the second argument of these macros
-that the test material is placed, the first is just to tag the test with
-some meaningful text.
-
-The difference between the two macros is that |\TEST| is for testing
-unexpandable commands, whereas |\TESTEXP| is for expandable ones. The
-consequence of this difference is that the \emph{entire} contents of
-|\TESTEXP|s test is executed within a |\typeout| macro, automatically printing
-its results to the |.log| file. This was demonstrated in the example shown
-in Figure~\ref{fig:minimaltest}:
-\begin{verbatim}
-\TEXTEXP{\@car, expect "YES"}{
-  \@car \YES \ERROR \@nil
-}
-\end{verbatim}
-where |\YES| is provided by the |regression-test| package to be the string
-``|YES|'' when within |\TESTEXP|. Within |\TEST|, by contrast, |\YES| will
-print ``|YES|'' to the |.log| file instead. The commands |\NO|, |\TRUE|, and
-|\FALSE| are also defined, which all behave in the same way.
-
-Any non-expandable setup code that is required to execute a |\TESTEXP| can
-always be placed outside of the command; alternatively, you could run the
-test within a plain |\TEST| command and |\typeout| the results manually.
-
-To emphasise this point, recall from the example that within any |\TEST|
-macro, the result you're testing for \emph{must} be written to the file with
-|\show| or |\typeout{\meaning...}| or similar. The |\YES| and |\NO| (etc.)
-macros can be convenient for this purpose, also. The non-expandable example
-shown earlier could also be written:
-\begin{verbatim}
-\TEST{\g at addto@macro, expect "aaabbb"}{
-  \def\test{aaa}
-  \g at addto@macro\test{bbb}
-  \def\expect{aaabbb}
-  \ifx\test\expect \YES \else \NO \fi
-}
-\end{verbatim}
-In this case the `expected' value is coded into the test itself rather than
-implicitly contained within the |.log| file.
-
-\section{What format to use}
-
-The format used to run the tests should not contain local specialties,
-i.e., it should have been built from a standard distribution using the
-no configuration files for fonts (i.e., no \texttt{fonttext.cfg} and
-no \texttt{fontmath.cfg}) nor a configuration file for hyphenation
-patterns (i.e., no \texttt{hyphen.cfg}). In particular, this means
-that the format will have only standard American hyphenation patterns
-included and that it will not support Babel extensions.%
-\footnote{Er, completely wrong?!}
-
-At some time in the future multi-lingual extensions should be added to
-the scope of the test suite but we prefer to wait with that for the
-release of a new multi-lingual interface to the kernel,
-see~\cite{tub:MR97} for research results on that interface.
-
-
-\section{Creating the .tlg File}
-
-
-If you are on a UNIX machine, a supplied shell script will run {\tt
-  latex} twice on your test file, then edit the \texttt{.log} to
-produce a \texttt{.tlg} file automatically.  At present, on other
-operating systems, you will need to do this by hand.\footnote{We are
-  grateful if we can include scripts for other operating systems to do
-  this task.} Run \LaTeX{} twice, afterwards delete all lines upto and
-including \verb|START-TEST-LOG|, and all lines after, and including
-\verb|END-TEST-LOG|.  Similarly remove lines \verb|OMIT| and
-\verb|TIMO|, and everything in between.  In addition remove all lines
-that refer to loading a font definition file (extension \texttt{.fd})
-including the line containing the closing parentheses denoting that
-the file was closed.  Finally replace the base part of the test file
-name whenever it shows up with ``nothing'', e.g., turn
-`\texttt{(tlen01.aux)}' into `{\tt(.aux)}'. In this way the files stay
-valid if we have to rename them.
-
-\section{Sending new files to the \LaTeX{} maintainers}
-
-It is important to realize, that only completely documented and
-checked files can be included into the automated checking system for
-\LaTeX2.09. The documentation, i.e., information what is supposed to
-show up in the {.tlg} file, etc., is very important, since if later
-such a file shows a change we need to be able to determine the reason
-for it. It is also important that we don't have to re-check the test
-file, in other words we like to get both the test file and the
-hand-check result file, i.e., the {\tt.tlg} file from you. Please send
-them to the address mentioned in \texttt{readme.val} file.
-
-
-\section{If You Find a Bug}
-The basic idea of this test system is to ensure that future releases
-do not introduce new bugs. That is, it will normally be assumed that
-if the new release produces different results on a test to an old
-release, then the new release has a bug. Because of this, if you
-discover while producing the file, that \LaTeX{} acts incorrectly in
-some context, still submit the file, but note clearly in the file, and
-in the email message, that you consider the current behaviour
-incorrect. Otherwise you may ensure that this behaviour is maintained
-in all future releases!
-
-
-\section{Call for volunteers}
-
-The more test files there are within this test suite exists the more
-reliable the \LaTeX{} system will become. We therefore call on you for
-help!  What we hope to find is a new group of volunteers that is
-interested in working on an extension of the \LaTeX{} test suite
-system. There is no need to be an expert \TeX{} or \LaTeX{} programmer
-for this task though some experience with \LaTeX{} and its inner
-workings will be necessary.
-
-\begin{center}
-\fbox{\begin{minipage}{\linewidth-2em}
-  \bfseries If you are interested in joining this effort, please
-  contact Daniel Flipo at
-\begin{center}
-  \texttt{Daniel.Flipo at univ-lille1.fr}
-\end{center}
-  who kindly agreed to act as a coordinator between the individual
-  volunteers.
-\end{minipage}}
-\end{center}
-Further details about this effort can be found in~\cite{tub:xxx}.
-
-\section{Sample files}
-
-As a more complex example we show a test file for the ``length'' module of
-\LaTeX2.09.
-Please note that it is important to document the desired output and
-also that only relevant information shows up in the {\tt.tlg} file.
-For this reason the allocation information for \verb=\newlength= is
-suppressed since it may change without making the interface invalid.
-
-\subsection{The file \texttt{tlen01.lvt}}
-\verbfile{tlen01.lvt}
-
-\onecolumn
-
-\subsection{The file \texttt{tlen01.tlg}}
-This is the resulting output after applying the UNIX script {\tt
-maketlg} to the file \texttt{tlen01.lvt}.
-\verbfile{tlen01.tlg}
-
-
-
-\begin{thebibliography}{1}
-\bibitem{A-W:LLa94}
-Leslie Lamport.
-\newblock {\em {\LaTeX:} A Document Preparation System}.
-\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
-
-\bibitem{tub:xxx}
-Frank Mittelbach.
-\newblock \emph{A regression test suite for \LaTeXe}.
-\newblock \TUB{} (?)\ldots
-
-\bibitem{tub:MR97}
-Frank Mittelbach and Chris Rowley.
-\newblock \emph{Language Information in   Structured Documents:
-  A Model for Mark-up and Rendering}.
-\newblock \TUB{} (?)\ldots
-
-\end{thebibliography}
-
-
-
-\end{document}
-
-
diff --git a/xpackages/Makefile b/xpackages/Makefile
deleted file mode 100644
index 8c0ded6..0000000
--- a/xpackages/Makefile
+++ /dev/null
@@ -1,177 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "xpackage" files                         #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check        - runs automated test suite"
-	@echo " make clean        - clean out test directory"
-	@echo " make cleanall     - clean out test and current directory"
-	@echo " make ctan         - create a CTAN-ready archive"
-	@echo " make doc          - typeset documentation"
-	@echo " make localinstall - install files in local texmf tree"
-	@echo " make tds          - create a TDS-ready archive"
-	@echo " make unpack       - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xpackages
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ..
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(PACKAGE) ; pwd)
-
-##############################################################
-# Directory structure for making zip files                   #
-##############################################################
-
-CTANROOT := $(TESTDIR)/ctan
-CTANDIR  := $(TESTDIR)/ctan/$(PACKAGE)
-TDSDIR   := $(TESTDIR)/tds
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-ALLPACKAGES = \
-	galley    \
-	xcontents \
-	xfootnote \
-	xfrontm   \
-	xhead     \
-	xinitials \
-	xlang     \
-	xor       \
-	xtheorem
-XPACKAGES   = xhead
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	clean        \
-	cleanall     \
-	ctan         \
-	doc          \
-	localinstall \
-	tds          \
-	unpack
-
-check:
-	for I in $(ALLPACKAGES) ; do \
-	  cd $$I ; \
-	  make check ; \
-	  cd .. ; \
-	done
-
-clean:
-	echo "Cleaning up"
-	rm -rf $(L3TESTDIR)/*
-
-cleanall: clean
-	for I in $(XPACKAGES) ; do \
-	  cd $$I ; \
-	  make cleanall ; \
-	  cd .. ; \
-	done
-
-ctan: tds
-	echo "Creating CTAN archive"
-	mkdir -p $(CTANDIR)/
-	rm -rf $(CTANDIR)/*
-	for I in $(XPACKAGES) ; do \
-	  cd $(TESTDIR)/$$I/ ; \
-	  cp -f *.dtx $(CTANDIR)/ ; \
-	  cp -f *.ins $(CTANDIR)/ ; \
-	  cp -f *.pdf $(CTANDIR)/ ; \
-	  cp -f *.tex $(CTANDIR)/ ; \
-	done
-	cd $(TESTDIR) ; \
-	cp $(PACKAGE).tds.zip $(CTANROOT)/ ; \
-	cp -f readme-ctan.txt $(CTANDIR)/ ; \
-	mv $(CTANDIR)/readme-ctan.txt $(CTANDIR)/README ; \
-	cd $(CTANROOT) ; \
-	zip -ll -q -r -X $(PACKAGE).zip .
-	cp $(CTANROOT)/$(PACKAGE).zip ./
-
-doc:
-	for I in $(XPACKAGES) ; do \
-	  cd $$I ; \
-	  make doc ; \
-	  cd .. ; \
-	done
-
-localinstall:
-	for I in $(XPACKAGES) ; do \
-	  cd $$I ; \
-	  make localinstall ; \
-	  cd .. ; \
-	done
-
-tds: $(TESTDIR)/readme-ctan.txt doc unpack
-	echo "Creating TDS archive"
-	mkdir -p $(TDSDIR)/
-	rm -rf $(TDSDIR)/*
-	mkdir -p $(TDSDIR)/doc/$(PACKAGEROOT)/
-	mkdir -p $(TDSDIR)/source/$(PACKAGEROOT)/
-	mkdir -p $(TDSDIR)/tex/$(PACKAGEROOT)/
-	for I in $(XPACKAGES) ; do \
-	  cd $(TDSDIR) ; \
-	  mkdir -p doc/$(PACKAGEROOT)/$$I/ ; \
-	  mkdir -p source/$(PACKAGEROOT)/$$I/ ; \
-	  mkdir -p tex/$(PACKAGEROOT)/$$I/ ; \
-	  cd $(TESTDIR)/$$I/ ; \
-	  cp -f *.dtx $(TDSDIR)/source/$(PACKAGEROOT)/$$I/ ; \
-	  cp -f *.ins $(TDSDIR)/source/$(PACKAGEROOT)/$$I/ ; \
-	  cp -f *.pdf $(TDSDIR)/doc/$(PACKAGEROOT)/$$I/ ; \
-	  cp -f *.sty $(TDSDIR)/tex/$(PACKAGEROOT)/$$I/ ; \
-	  cp -f *.tex $(TDSDIR)/doc/$(PACKAGEROOT)/$$I/ ; \
-	done
-	cd $(TESTDIR) ; \
-	cp -f readme-ctan.txt $(TDSDIR)/doc/$(PACKAGEROOT)/ ; \
-	cd $(TDSDIR) ; \
-	mv doc/$(PACKAGEROOT)/readme-ctan.txt doc/$(PACKAGEROOT)/README ; \
-	zip -ll -q -r -X $(PACKAGE).tds.zip . ; \
-	cd $(TESTDIR) ; \
-	cp $(TDSDIR)/$(PACKAGE).tds.zip ./
-
-unpack:
-	for I in $(ALLPACKAGES) ; do \
-	  cd $$I ; \
-	  make unpack ; \
-	  cd .. ; \
-	done
diff --git a/xpackages/galley/Makefile b/xpackages/galley/Makefile
deleted file mode 100644
index 4faa88d..0000000
--- a/xpackages/galley/Makefile
+++ /dev/null
@@ -1,204 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "galley" files                           #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check            - runs automated test suite"
-	@echo " make clean            - clean out test directory"
-	@echo " make cleanall         - clean out test and current directory"
-	@echo " make doc              - typeset documentation"
-	@echo " make localinstall     - install files in local texmf tree"
-	@echo " make test             - typeset test files"
-	@echo " make unpack           - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xpackages/galley
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ../..
-EXPL3DIR    := $(BASEDIR)/l3in2e
-SUPPORTDIR  := $(BASEDIR)/support
-TESTFILEDIR := $(SOURCEDIR)/testfiles
-VALIDATEDIR := $(BASEDIR)/validate
-XBASEDIR    := $(BASEDIR)/xpackages/xbase
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(PACKAGE) ; pwd)
-TESTAUXDIR := $(shell test -d $(TESTDIR)/testfiles || mkdir -p $(TESTDIR)/testfiles ; cd $(TESTDIR)/testfiles ; pwd)
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-DTX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-DTXFILES  = $(subst .dtx,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-TESTFILES = xhj-test
-TEX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.tex)))
-UNPACK    = galley2.ins
-
-##############################################################
-# Clean-up information                                       #
-##############################################################
-
-AUXFILES = \
-	aux  \
-	cmds \
-	glo  \
-	gls  \
-	hd   \
-	idx  \
-	ilg  \
-	ind  \
-	log  \
-	out  \
-	tmp  \
-	toc  \
-	xref
-
-CLEAN = \
-	cls  \
-	diff \
-	fmt  \
-	gz   \
-	ist  \
-	ltx  \
-	pdf  \
-	sty  \
-	zip
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(TESTDIR)/%.dtx: $(SOURCEDIR)/%.dtx
-	@cp -fp $< $@
-
-$(TESTDIR)/%.ins: $(SOURCEDIR)/%.ins
-	@cp -fp $< $@
-
-$(TESTDIR)/%.tex: $(SOURCEDIR)/%.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# File building: default actions                                #
-################################################################
-
-$(TESTDIR)/%.pdf: $(TESTDIR)/%.dtx
-	NAME=`basename $< .dtx` ; \
-	echo "Typesetting $$NAME" ; \
-	cd $(TESTDIR) ; \
-	pdflatex -draftmode -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	if [ $$? = 0 ] ; then  \
-	  makeindex -s l3doc.ist -o $$NAME.ind $$NAME.idx > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  if [ `grep 'defined but not documented' $$NAME.log | wc -l` -ne 0 ] ; then \
-	    echo "! Warning: some functions defined but not documented" ; \
-	  fi ; \
-	  if [ `grep 'documented but not defined' $$NAME.log | wc -l` -ne 0 ]  ; then \
-	    echo "! Warning: some functions documented but not defined" ; \
-	  fi ; \
-	else \
-	  echo "  Compilation failed" ; \
-	fi ; \
-	for I in $(AUXFILES) ; do \
-	  rm -f $$NAME.$$I ; \
-	done
-################################################################
-# Internal make options                                        #
-################################################################
-
-.PHONY = \
-	expl3   \
-	support \
-	xbase
-
-expl3:
-	cd $(EXPL3DIR) ; \
-	make localinstall
-
-support: \
-	$(foreach FILE,$(SCRIPTS),$(SCRIPTDIR)/$(FILE))  \
-	$(foreach FILE,$(VALIDATE),$(TESTDIR)/$(FILE))
-
-xbase:
-	cd $(XBASEDIR) ; \
-	make localinstall
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	clean        \
-	cleanall     \
-	doc          \
-	localinstall \
-	test         \
-	unpack
-
-clean:
-	echo "Cleaning up"
-	rm -rf $(TESTDIR)/*.*
-
-cleanall: clean
-	for I in $(AUXFILES) $(CLEAN) ; do \
-	  rm -f *.$$I ; \
-	done
-
-doc: $(foreach FILE,$(DTXFILES),$(TESTDIR)/$(FILE).pdf)
-
-localinstall: unpack
-	echo "Installing files"
-	TEXMFHOME=`kpsewhich --var-value=TEXMFHOME` ; \
-	mkdir -p $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	rm -rf $$TEXMFHOME/tex/$(PACKAGEROOT)/* ; \
-	cd $(TESTDIR) ; \
-	cp *.sty $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	texhash > /dev/null
-
-test: \
-	$(foreach FILE,$(TESTFILES),$(TESTDIR)/$(FILE).tex) \
-	expl3 unpack
-	echo "Testing files"
-	cd $(TESTDIR) ;\
-	for I in $(TESTFILES) ; do \
-	  echo " $$I" ; \
-	  pdflatex  $$I ; \
-	done
-
-unpack: $(foreach FILE,$(DTX) $(TEX) $(UNPACK),$(TESTDIR)/$(FILE))
-	echo "Unpacking files"
-	cd $(TESTDIR) ; \
-	for I in $(UNPACK) ; do \
-	  tex $$I > /dev/null ; \
-	done
diff --git a/xpackages/galley/make.bat b/xpackages/galley/make.bat
deleted file mode 100644
index c731d41..0000000
--- a/xpackages/galley/make.bat
+++ /dev/null
@@ -1,135 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi idx log toc
-set CLEAN=pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set TEST=xhj-test
-set XBASEDIR=..\xbase
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "check"  goto :check
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "test"   goto :test
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins > temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins > temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-
-  goto :unpack-int
-
-:check
-
-  set NEXT=check-return
-  goto :all-int
-  
-:check-return
-
-  set NEXT=clean
-  goto :test-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-  
-  goto :end
-  
-:doc
-
-  for %%I in (*.dtx) do (
-    echo  %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make check              - set up and run all test files
-  echo  make doc                - typeset all dtx files
-  echo  make test               - run all test files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:test
-
-  set NEXT=clean-int
-
-:test-int
-
-  for %%I in (%TEST%) do (
-    echo   %%I
-    pdflatex -interaction=batchmode %%I > temp.log
-    if not ERRORLEVEL 0 (
-      echo.
-      echo **********************
-      echo * Compilation failed *
-      echo **********************
-      echo.
-    )
-  )
-
-  goto :%NEXT%  
-
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file
diff --git a/xpackages/make.bat b/xpackages/make.bat
deleted file mode 100644
index d4619f2..0000000
--- a/xpackages/make.bat
+++ /dev/null
@@ -1,222 +0,0 @@
- at echo off
-rem This Windows batch file provides very similar functionality to the
-rem Makefile also available here.  Some of the options provided here 
-rem require a zip program such as Info-ZIP (http://www.info-zip.org).
-
-setlocal
-
-set CLEAN=zip
-set CTAN= xhead
-set PACKAGE=xpackages
-set PATHCOPY=%PATH%
-set TDSROOT=latex\%PACKAGE%
-set TEST=xbase
-set TXT=readme-ctan
-set XPACKAGES=galley xcontents xfootnote xfrontm xinitials xlang xor xtheorem
-
-:loop
-
-  if /i [%1] == [clean]        goto :clean
-  if /i [%1] == [ctan]         goto :ctan
-  if /i [%1] == [localinstall] goto :localinstall
-  if /i [%1] == [tds]          goto :tds
-  if /i [%1] == [test]         goto :test
-
-  goto :help
-
-:clean
-
-  for %%I in (%XPACKACKAGES%) do (
-    pushd %%I
-    call make clean
-    popd
-  )
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-  goto :end
-
-:ctan
-
-  call :zip
-
-  echo.
-  echo Creating CTAN file
-  echo.
-
-  if exist temp\*.* rmdir /q /s temp
-  if exist tds\*.*  rmdir /q /s tds
-
-  for %%I in (%CTAN%) do (
-    echo Typesetting
-    pushd %%I
-    call make unpack
-    xcopy /q /y *.sty ..\tds\tex\%TDSROOT%\%%I\      > nul
-    call make doc
-    xcopy /q /y *.dtx ..\temp\%PACKAGE%\             > nul
-    xcopy /q /y *.dtx ..\tds\source\%TDSROOT%\%%I\   > nul
-    xcopy /q /y *.ins ..\temp\%PACKAGE%\             > nul
-    xcopy /q /y *.ins ..\tds\source\%TDSROOT%\%%I\   > nul
-    xcopy /q /y *.pdf ..\temp\%PACKAGE%\             > nul
-    xcopy /q /y *.pdf ..\tds\doc\%TDSROOT%\%%I\      > nul
-    if exist *.tex (
-      xcopy /q /y *.tex ..\temp\%PACKAGE%\           > nul
-      xcopy /q /y *.tex ..\tds\source\%TDSROOT%\%%I\ > nul
-    )
-    call make clean
-    popd
-  )
-
-  for %%I in (%TXT%) do (
-    xcopy /q /y %%I.txt temp\%PACKAGE%\    > nul
-    xcopy /q /y %%I.txt tds\doc\%TDSROOT%\ > nul
-    ren temp\%PACKAGE%\%%I.txt    %%I
-    ren tds\doc\%TDSROOT%\%%I.txt %%I
-  )
-
-  ren temp\%PACKAGE%\readme-ctan    README
-  ren tds\doc\%TDSROOT%\readme-ctan README
-
-  echo.
-  echo Creating archive
-
-  pushd tds
-  %ZIPEXE% %ZIPFLAG% %PACKAGE%.tds.zip .
-  popd
-  xcopy /q /y tds\%PACKAGE%.tds.zip temp\ > nul
-
-  pushd temp
-  %ZIPEXE% %ZIPFLAG% %PACKAGE%.zip .
-  popd
-  xcopy /q /y temp\%PACKAGE%.zip > nul
-
-  rmdir /q /s temp
-  rmdir /q /s tds
-
-  goto :end
-
-:help
-
-  echo.
-  echo  make clean        - clean out all directories
-  echo  make ctan         - create a zip file ready to go to CTAN
-  echo  make localinstall - install the .sty files in your home texmf tree
-  echo  make tds          - creates a TDS-ready zip of CTAN packages
-  echo  make test         - set up and run all test documents
-  
-  goto :end
-
-:localinstall
-
-  echo.
-  echo Installing files
-
-  if not defined TEXMFHOME (
-    set TEXMFHOME=%USERPROFILE%\texmf
-  )
-  set INSTALLROOT=%TEXMFHOME%\tex\%TDSROOT%
-
-  if exist "%INSTALLROOT%\*.*" rmdir /q /s "%INSTALLROOT%"
-
-  for %%I in (%XPACKAGES%) do (
-    echo   %%I
-    pushd %%I
-    call make unpack
-    xcopy /q /y *.sty "%INSTALLROOT%\%%I\"   > nul 
-    call make clean
-    popd
-  )
-
-  goto :end
-  
-:tds
-
-  call :zip
-
-  echo.
-  echo Creating TDS file
-  echo.
-
-  if exist tds\*.*  rmdir /q /s tds
-
-  for %%I in (%CTAN%) do (
-    echo Typesetting
-    pushd %%I
-    call make unpack
-    xcopy /q /y *.sty ..\tds\tex\%TDSROOT%\%%I\      > nul
-    call make doc
-    xcopy /q /y *.dtx ..\tds\source\%TDSROOT%\%%I\   > nul
-    xcopy /q /y *.ins ..\tds\source\%TDSROOT%\%%I\   > nul
-    xcopy /q /y *.pdf ..\tds\doc\%TDSROOT%\%%I\      > nul
-    if exist *.tex (
-      xcopy /q /y *.tex ..\tds\source\%TDSROOT%\%%I > nul
-    )
-    call make clean
-    popd
-  )
-
-  for %%I in (%TXT%) do (
-    xcopy /q /y %%I.txt tds\doc\%TDSROOT%\ > nul
-    ren tds\doc\%TDSROOT%\%%I.txt %%I
-  )
-
-  ren tds\doc\%TDSROOT%\readme-ctan README
-
-  echo.
-  echo Creating archive
-
-  pushd tds
-  %ZIPEXE% %ZIPFLAG% %PACKAGE%.tds.zip .
-  popd
-  xcopy /q /y tds\%PACKAGE%.tds.zip > nul
-
-  rmdir /q /s tds
-  
-  goto :end
-
-:test
-  
-  for %%I in (%TEST%) do (
-    echo.
-    echo Testing %%I
-    pushd %%I
-    call make test clean
-    popd
-  )
-
-  goto :end
-
-:zip 
-
-  set PATHCOPY=%PATH%
-
-:zip-loop
-
-  if defined ZIPEXE goto :EOF
-
-  for /f "delims=; tokens=1,2*" %%I in ("%PATHCOPY%") do (
-    if exist "%%I\zip.exe" (
-      set ZIPEXE=zip
-      set ZIPFLAG=-ll -q -r -X
-    )
-    set PATHCOPY=%%J;%%K
-  )
-  if not "%PATHCOPY%" == ";" goto :zip-loop
-  
-  if not defined ZIPEXE (
-    echo.
-    echo This procedure requires a zip program,
-    echo but one could not be found.
-    echo
-    echo If you do have a command-line zip program installed,
-    echo set ZIPEXE to the full executable path and ZIPFLAG to the
-    echo appropriate flag to create an archive.
-    echo.
-  )
-
-  goto :EOF
-
-:end
-
-  shift
-  if not [%1] == [] goto :loop
\ No newline at end of file
diff --git a/xpackages/xcontents/Makefile b/xpackages/xcontents/Makefile
deleted file mode 100644
index ed9616e..0000000
--- a/xpackages/xcontents/Makefile
+++ /dev/null
@@ -1,302 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "xcontents" files                            #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check            - runs automated test suite"
-	@echo " make checklvt F=<name>   - runs automated test on <name>"
-	@echo " make clean            - clean out test directory"
-	@echo " make cleanall         - clean out test and current directory"
-	@echo " make doc              - typeset documentation"
-	@echo " make localinstall     - install files in local texmf tree"
-	@echo " make savetlg F=<name> - save test log for <name>"
-	@echo " make test             - typeset test files"
-	@echo " make unpack           - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xpackages/xcontents
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ../..
-EXPL3DIR    := $(BASEDIR)/l3in2e
-SUPPORTDIR  := $(BASEDIR)/support
-TESTFILEDIR := $(SOURCEDIR)/testfiles
-VALIDATEDIR := $(BASEDIR)/validate
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-SCRIPTDIR  := $(shell test -d $(L3TESTDIR)/scripts || mkdir -p $(L3TESTDIR)/scripts ; cd $(L3TESTDIR)/scripts ; pwd)
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(PACKAGE) ; pwd)
-TESTAUXDIR := $(shell test -d $(TESTDIR)/testfiles || mkdir -p $(TESTDIR)/testfiles ; cd $(TESTDIR)/testfiles ; pwd)
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-DTX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-DTXFILES  = $(subst .dtx,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-TESTFILES = template-test template-test2 tprestrict-test xparse-test
-TEX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.tex)))
-UNPACK    = xcontents.ins
-
-##############################################################
-# Files for the check systems                                #
-##############################################################
-
-CHECKFILES = $(subst .tlg,,$(notdir $(wildcard $(TESTFILEDIR)/*.tlg)))
-SCRIPTS    = log2tlg
-VALIDATE   = commands-check.tex regression-test.tex
-
-##############################################################
-# Clean-up information                                       #
-##############################################################
-
-AUXFILES = \
-	aux  \
-	cmds \
-	glo  \
-	gls  \
-	hd   \
-	idx  \
-	ilg  \
-	ind  \
-	log  \
-	out  \
-	tmp  \
-	toc  \
-	xref
-
-CLEAN = \
-	cls  \
-	diff \
-	fmt  \
-	gz   \
-	ist  \
-	ltx  \
-	pdf  \
-	sty  \
-	zip
-
-################################################################
-# Document settings                                            #
-################################################################
-
-PDFSETTINGS=\pdfminorversion=5  \pdfobjcompresslevel=2
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(SCRIPTDIR)/%: $(SUPPORTDIR)/%
-	@cp -fp $< $@
-	@chmod +x $@
-
-$(TESTDIR)/%.dtx: $(SOURCEDIR)/%.dtx
-	@cp -fp $< $@
-
-$(TESTDIR)/%.ins: $(SOURCEDIR)/%.ins
-	@cp -fp $< $@
-
-$(TESTDIR)/%.lvt: $(TESTFILEDIR)/%.lvt
-	@cp -fp $< $@
-
-$(TESTDIR)/%.tex: $(SOURCEDIR)/%.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.tlg: $(TESTFILEDIR)/%.tlg
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# File copying: specials                                       #
-################################################################
-
-$(TESTDIR)/commands-check.tex: $(VALIDATEDIR)/commands-check.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/regression-test.tex: $(VALIDATEDIR)/regression-test.tex
-	@cp -fp $< $@	
-
-################################################################
-# File building: default actions                                #
-################################################################
-
-$(TESTDIR)/%.pdf: $(TESTDIR)/%.dtx
-	NAME=`basename $< .dtx` ; \
-	echo "Typesetting $$NAME" ; \
-	cd $(TESTDIR) ; \
-	pdflatex -draftmode -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	if [ $$? = 0 ] ; then  \
-	  makeindex -s l3doc.ist -o $$NAME.ind $$NAME.idx > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  if [ `grep 'defined but not documented' $$NAME.log | wc -l` -ne 0 ] ; then \
-	    echo "! Warning: some functions defined but not documented" ; \
-	  fi ; \
-	  if [ `grep 'documented but not defined' $$NAME.log | wc -l` -ne 0 ]  ; then \
-	    echo "! Warning: some functions documented but not defined" ; \
-	  fi ; \
-	else \
-	  echo "  Compilation failed" ; \
-	fi ; \
-	for I in $(AUXFILES) ; do \
-	  rm -f $$NAME.$$I ; \
-	done
-
-################################################################
-# Internal make options                                        #
-################################################################
-
-.PHONY = \
-	expl3 \
-	support
-
-expl3:
-	cd $(EXPL3DIR) ; \
-	make localinstall
-
-support: \
-	$(foreach FILE,$(SCRIPTS),$(SCRIPTDIR)/$(FILE))  \
-	$(foreach FILE,$(VALIDATE),$(TESTDIR)/$(FILE))
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	checklvt     \
-	clean        \
-	cleanall     \
-	doc          \
-	localinstall \
-	savetlg      \
-	test         \
-	unpack
-
-clean:
-	echo "Cleaning up"
-	rm -rf $(TESTDIR)/*.*
-
-cleanall: clean
-	for I in $(AUXFILES) $(CLEAN) ; do \
-	  rm -f *.$$I ; \
-	done
-
-check: \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).lvt) \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).tlg) \
-	expl3 support unpack
-	echo "Running checks on"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	for I in $(CHECKFILES) ; do \
-	  echo "  $$I" ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  perl $(SCRIPTDIR)/log2tlg $$I < $$I.log > $$I.new.log ; \
-	  if !(cmp -s $$I.tlg $$I.new.log) ; then \
-	    diff -c $$I.tlg $$I.new.log > $$I.diff ; \
-	  fi ; \
-	  for J in $(AUXFILES) lvt tlg ; do \
-	    rm -f $$I.$$J ; \
-	  done ; \
-	done ; \
-	if (ls *.diff > /dev/null) ; then \
-	  echo "  Check failed with difference files" ; \
-	  for I in *.diff ; do \
-	    echo "  - " `pwd`"/$$I" ; \
-	  done ; \
-	else \
-	  echo "  All checks passed" ; \
-	fi
-
-checklvt: $(TESTDIR)/$(F).lvt $(TESTDIR)/$(F).tlg support unpack
-	echo "Running checks on $(F)"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).new.log ; \
-	if !(cmp -s $(F).tlg $(F).new.log) ; then \
-	  diff -c $(F).new.log $(F).tlg > $(F).diff ; \
-	fi ; \
-	for I in $(AUXFILES) lvt pdf tlg ; do \
-	  rm -f $(F).$$I ; \
-	done ; \
-	if (test -f $(F).diff) ; then \
-	  echo "  Check failed" ; \
-	  more `pwd`/$(F).diff ; \
-	else \
-	  echo "  Check passed" ; \
-	fi
-
-doc: $(foreach FILE,$(DTXFILES),$(TESTDIR)/$(FILE).pdf)
-
-localinstall: unpack
-	echo "Installing files"
-	TEXMFHOME=`kpsewhich --var-value=TEXMFHOME` ; \
-	mkdir -p $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	rm -rf $$TEXMFHOME/tex/$(PACKAGEROOT)/* ; \
-	cd $(TESTDIR) ; \
-	cp *.sty $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	texhash > /dev/null
-
-savetlg: $(TESTDIR)/$(F).lvt support unpack
-	echo "Creating and copying $(F).tlg"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	rm -f $$I.pdf ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).tlg
-	cp -f $(TESTDIR)/$(F).tlg $(TESTFILEDIR)/$(F).tlg
-
-test: \
-	$(foreach FILE,$(TESTFILES),$(TESTDIR)/$(FILE).tex) \
-	expl3 unpack
-	echo "Testing files"
-	cd $(TESTDIR) ;\
-	for I in $(TESTFILES) ; do \
-	  echo " $$I" ; \
-	  pdflatex  $$I ; \
-	done
-
-unpack: $(foreach FILE,$(DTX) $(TEX) $(UNPACK),$(TESTDIR)/$(FILE))
-	echo "Unpacking files"
-	cd $(TESTDIR) ; \
-	for I in $(UNPACK) ; do \
-	  tex $$I > /dev/null ; \
-	done
diff --git a/xpackages/xcontents/make.bat b/xpackages/xcontents/make.bat
deleted file mode 100644
index 89b44e4..0000000
--- a/xpackages/xcontents/make.bat
+++ /dev/null
@@ -1,101 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi log sig toc
-set CLEAN=pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set XBASEDIR=..\xbase
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins > temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins > temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-
-  goto :unpack-int
-
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-  
-  goto :end
-  
-:doc
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make doc                - typeset all dtx files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file
diff --git a/xpackages/xfootnote/Makefile b/xpackages/xfootnote/Makefile
deleted file mode 100644
index 7c8920f..0000000
--- a/xpackages/xfootnote/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-all:	xbase getl3 unpack
-
-xbase:
-	(cd ../xbase; latex xbase.ins)
-	mv ../xbase/*.sty .
-
-getl3:
-	(cd ../../l3in2e ; latex l3.ins )
-	mv ../../l3in2e/*.sty .
-
-unpack:
-	latex xfootnote.ins
-
-clean:
-	rm -f *.sty *.dvi *.aux *.log *.toc *~
-	rm -f l3in2e.err
-
-test:
-	latex xfootnote-test
-
-check: xbase getl3 unpack test clean
diff --git a/xpackages/xfootnote/make.bat b/xpackages/xfootnote/make.bat
deleted file mode 100644
index 33dd3a4..0000000
--- a/xpackages/xfootnote/make.bat
+++ /dev/null
@@ -1,135 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi log toc
-set CLEAN=pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set TEST=xfootnote-test
-set XBASEDIR=..\xbase
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "check"  goto :check
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "test"   goto :test
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins > temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins > temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-
-  goto :unpack-int
-
-:check
-
-  set NEXT=check-return
-  goto :all-int
-  
-:check-return
-
-  set NEXT=clean
-  goto :test-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-    
-  goto :end
-  
-:doc
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make check              - set up and run all test files
-  echo  make doc                - typeset all dtx files
-  echo  make test               - run all test files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:test
-
-  set NEXT=clean-int
-
-:test-int
-
-  for %%I in (%TEST%) do (
-    echo   %%I
-    pdflatex -interaction=batchmode %%I > temp.log
-    if not ERRORLEVEL 0 (
-      echo.
-      echo **********************
-      echo * Compilation failed *
-      echo **********************
-      echo.
-    )
-  )
-
-  goto :%NEXT%  
-
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file
diff --git a/xpackages/xfrontm/Makefile b/xpackages/xfrontm/Makefile
deleted file mode 100644
index 6d481c9..0000000
--- a/xpackages/xfrontm/Makefile
+++ /dev/null
@@ -1,301 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "xfrontm" files                            #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check            - runs automated test suite"
-	@echo " make checklvt F=<name>   - runs automated test on <name>"
-	@echo " make clean            - clean out test directory"
-	@echo " make cleanall         - clean out test and current directory"
-	@echo " make doc              - typeset documentation"
-	@echo " make localinstall     - install files in local texmf tree"
-	@echo " make savetlg F=<name> - save test log for <name>"
-	@echo " make test             - typeset test files"
-	@echo " make unpack           - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xpackages/xfrontm
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ../..
-EXPL3DIR    := $(BASEDIR)/l3in2e
-SUPPORTDIR  := $(BASEDIR)/support
-TESTFILEDIR := $(SOURCEDIR)/testfiles
-VALIDATEDIR := $(BASEDIR)/validate
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-SCRIPTDIR  := $(shell test -d $(L3TESTDIR)/scripts || mkdir -p $(L3TESTDIR)/scripts ; cd $(L3TESTDIR)/scripts ; pwd)
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(PACKAGE) ; pwd)
-TESTAUXDIR := $(shell test -d $(TESTDIR)/testfiles || mkdir -p $(TESTDIR)/testfiles ; cd $(TESTDIR)/testfiles ; pwd)
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-DTX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-DTXFILES  = $(subst .dtx,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-TESTFILES = template-test template-test2 tprestrict-test xparse-test
-TEX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.tex)))
-UNPACK    = xfrontm.ins
-
-##############################################################
-# Files for the check systems                                #
-##############################################################
-
-CHECKFILES = $(subst .tlg,,$(notdir $(wildcard $(TESTFILEDIR)/*.tlg)))
-SCRIPTS    = log2tlg
-VALIDATE   = commands-check.tex regression-test.tex
-
-##############################################################
-# Clean-up information                                       #
-##############################################################
-
-AUXFILES = \
-	aux  \
-	cmds \
-	glo  \
-	gls  \
-	hd   \
-	idx  \
-	ilg  \
-	ind  \
-	log  \
-	out  \
-	tmp  \
-	toc  \
-	xref
-
-CLEAN = \
-	cls  \
-	diff \
-	fmt  \
-	gz   \
-	ist  \
-	ltx  \
-	pdf  \
-	sty  \
-	zip
-
-################################################################
-# Document settings                                            #
-################################################################
-
-PDFSETTINGS=\pdfminorversion=5  \pdfobjcompresslevel=2
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(SCRIPTDIR)/%: $(SUPPORTDIR)/%
-	@cp -fp $< $@
-	@chmod +x $@
-
-$(TESTDIR)/%.dtx: $(SOURCEDIR)/%.dtx
-	@cp -fp $< $@
-
-$(TESTDIR)/%.ins: $(SOURCEDIR)/%.ins
-	@cp -fp $< $@
-
-$(TESTDIR)/%.lvt: $(TESTFILEDIR)/%.lvt
-	@cp -fp $< $@
-
-$(TESTDIR)/%.tex: $(SOURCEDIR)/%.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.tlg: $(TESTFILEDIR)/%.tlg
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# File copying: specials                                       #
-################################################################
-
-$(TESTDIR)/commands-check.tex: $(VALIDATEDIR)/commands-check.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/regression-test.tex: $(VALIDATEDIR)/regression-test.tex
-	@cp -fp $< $@	
-
-################################################################
-# File building: default actions                                #
-################################################################
-
-$(TESTDIR)/%.pdf: $(TESTDIR)/%.dtx
-	NAME=`basename $< .dtx` ; \
-	echo "Typesetting $$NAME" ; \
-	cd $(TESTDIR) ; \
-	pdflatex -draftmode -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	if [ $$? = 0 ] ; then  \
-	  makeindex -s l3doc.ist -o $$NAME.ind $$NAME.idx > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  if [ `grep 'defined but not documented' $$NAME.log | wc -l` -ne 0 ] ; then \
-	    echo "! Warning: some functions defined but not documented" ; \
-	  fi ; \
-	  if [ `grep 'documented but not defined' $$NAME.log | wc -l` -ne 0 ]  ; then \
-	    echo "! Warning: some functions documented but not defined" ; \
-	  fi ; \
-	else \
-	  echo "  Compilation failed" ; \
-	fi ; \
-	for I in $(AUXFILES) ; do \
-	  rm -f $$NAME.$$I ; \
-	done
-################################################################
-# Internal make options                                        #
-################################################################
-
-.PHONY = \
-	expl3 \
-	support
-
-expl3:
-	cd $(EXPL3DIR) ; \
-	make localinstall
-
-support: \
-	$(foreach FILE,$(SCRIPTS),$(SCRIPTDIR)/$(FILE))  \
-	$(foreach FILE,$(VALIDATE),$(TESTDIR)/$(FILE))
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	checklvt     \
-	clean        \
-	cleanall     \
-	doc          \
-	localinstall \
-	savetlg      \
-	test         \
-	unpack
-
-clean:
-	echo "Cleaning up"
-	rm -rf $(TESTDIR)/*.*
-
-cleanall: clean
-	for I in $(AUXFILES) $(CLEAN) ; do \
-	  rm -f *.$$I ; \
-	done
-
-check: \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).lvt) \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).tlg) \
-	expl3 support unpack
-	echo "Running checks on"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	for I in $(CHECKFILES) ; do \
-	  echo "  $$I" ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  perl $(SCRIPTDIR)/log2tlg $$I < $$I.log > $$I.new.log ; \
-	  if !(cmp -s $$I.tlg $$I.new.log) ; then \
-	    diff -c $$I.tlg $$I.new.log > $$I.diff ; \
-	  fi ; \
-	  for J in $(AUXFILES) lvt tlg ; do \
-	    rm -f $$I.$$J ; \
-	  done ; \
-	done ; \
-	if (ls *.diff > /dev/null) ; then \
-	  echo "  Check failed with difference files" ; \
-	  for I in *.diff ; do \
-	    echo "  - " `pwd`"/$$I" ; \
-	  done ; \
-	else \
-	  echo "  All checks passed" ; \
-	fi
-
-checklvt: $(TESTDIR)/$(F).lvt $(TESTDIR)/$(F).tlg support unpack
-	echo "Running checks on $(F)"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).new.log ; \
-	if !(cmp -s $(F).tlg $(F).new.log) ; then \
-	  diff -c $(F).new.log $(F).tlg > $(F).diff ; \
-	fi ; \
-	for I in $(AUXFILES) lvt pdf tlg ; do \
-	  rm -f $(F).$$I ; \
-	done ; \
-	if (test -f $(F).diff) ; then \
-	  echo "  Check failed" ; \
-	  more `pwd`/$(F).diff ; \
-	else \
-	  echo "  Check passed" ; \
-	fi
-
-doc: $(foreach FILE,$(DTXFILES),$(TESTDIR)/$(FILE).pdf)
-
-localinstall: unpack
-	echo "Installing files"
-	TEXMFHOME=`kpsewhich --var-value=TEXMFHOME` ; \
-	mkdir -p $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	rm -rf $$TEXMFHOME/tex/$(PACKAGEROOT)/* ; \
-	cd $(TESTDIR) ; \
-	cp *.sty $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	texhash > /dev/null
-
-savetlg: $(TESTDIR)/$(F).lvt support unpack
-	echo "Creating and copying $(F).tlg"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	rm -f $$I.pdf ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).tlg
-	cp -f $(TESTDIR)/$(F).tlg $(TESTFILEDIR)/$(F).tlg
-
-test: \
-	$(foreach FILE,$(TESTFILES),$(TESTDIR)/$(FILE).tex) \
-	expl3 unpack
-	echo "Testing files"
-	cd $(TESTDIR) ;\
-	for I in $(TESTFILES) ; do \
-	  echo " $$I" ; \
-	  pdflatex  $$I ; \
-	done
-
-unpack: $(foreach FILE,$(DTX) $(TEX) $(UNPACK),$(TESTDIR)/$(FILE))
-	echo "Unpacking files"
-	cd $(TESTDIR) ; \
-	for I in $(UNPACK) ; do \
-	  tex $$I > /dev/null ; \
-	done
diff --git a/xpackages/xfrontm/make.bat b/xpackages/xfrontm/make.bat
deleted file mode 100644
index cb8d38a..0000000
--- a/xpackages/xfrontm/make.bat
+++ /dev/null
@@ -1,146 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi log toc
-set CLEAN=cls pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set XBASEDIR=..\xbase
-set XORDIR=..\xor
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "check"  goto :check
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "test"   goto :test
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins > temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins > temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XORDIR%
-  tex xo.ins > temp.log
-  popd
-  copy /y %XORDIR%\*.sty > temp.log
-  pushd %XORDIR%
-  ren template-doc.sty template-doc.xxx > temp.log
-  del /q *.sty *.log
-  ren template-doc.xxx template-doc.sty > temp.log
-  popd
-
-  goto :unpack-int
-
-:check
-
-  set NEXT=check-return
-  goto :all-int
-  
-:check-return
-
-  set NEXT=clean
-  goto :test-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-  
-  if exist xfmgalley-sample.tex del /q xfmgalley-sample.tex 
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-    
-  goto :end
-  
-:doc
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make check              - set up and run all test files
-  echo  make doc                - typeset all dtx files
-  echo  make test               - run all test files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:test
-
-  set NEXT=clean-int
-
-:test-int
-  
-  echo   xfm-test userinput=1
-  latex -interaction=batchmode "\def\userinput{1}\input{xfm-test.tex}" > temp.log
-  echo   xfm-test userinput=2
-  latex -interaction=batchmode "\def\userinput{2}\input{xfm-test.tex}" > temp.log
-  rem echo   xfm-test userinput=3
-  rem latex -interaction=batchmode "\def\userinput{3}\input{xfm-test.tex}" broken!
-  echo   xfm-test userinput=4
-  latex -interaction=batchmode "\def\userinput{4}\input{xfm-test.tex}" > temp.log
-  echo   xfm-test userinput=5
-  latex -interaction=batchmode "\def\userinput{5}\input{xfm-test.tex}" > temp.log
-
-  goto :%NEXT%  
-
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file
diff --git a/xpackages/xhead/Makefile b/xpackages/xhead/Makefile
deleted file mode 100644
index 0832a07..0000000
--- a/xpackages/xhead/Makefile
+++ /dev/null
@@ -1,302 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "xhead" files                            #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check            - runs automated test suite"
-	@echo " make checklvt F=<name>   - runs automated test on <name>"
-	@echo " make clean            - clean out test directory"
-	@echo " make cleanall         - clean out test and current directory"
-	@echo " make doc              - typeset documentation"
-	@echo " make localinstall     - install files in local texmf tree"
-	@echo " make savetlg F=<name> - save test log for <name>"
-	@echo " make test             - typeset test files"
-	@echo " make unpack           - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xpackages/xhead
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ../..
-EXPL3DIR    := $(BASEDIR)/l3in2e
-SUPPORTDIR  := $(BASEDIR)/support
-TESTFILEDIR := $(SOURCEDIR)/testfiles
-VALIDATEDIR := $(BASEDIR)/validate
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-SCRIPTDIR  := $(shell test -d $(L3TESTDIR)/scripts || mkdir -p $(L3TESTDIR)/scripts ; cd $(L3TESTDIR)/scripts ; pwd)
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(PACKAGE) ; pwd)
-TESTAUXDIR := $(shell test -d $(TESTDIR)/testfiles || mkdir -p $(TESTDIR)/testfiles ; cd $(TESTDIR)/testfiles ; pwd)
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-DTX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-DTXFILES  = $(subst .dtx,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-TESTFILES = template-test template-test2 tprestrict-test xparse-test
-TEX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.tex)))
-UNPACK    = xhead.ins
-
-##############################################################
-# Files for the check systems                                #
-##############################################################
-
-CHECKFILES = $(subst .tlg,,$(notdir $(wildcard $(TESTFILEDIR)/*.tlg)))
-SCRIPTS    = log2tlg
-VALIDATE   = commands-check.tex regression-test.tex
-
-##############################################################
-# Clean-up information                                       #
-##############################################################
-
-AUXFILES = \
-	aux  \
-	cmds \
-	glo  \
-	gls  \
-	hd   \
-	idx  \
-	ilg  \
-	ind  \
-	log  \
-	out  \
-	tmp  \
-	toc  \
-	xref
-
-CLEAN = \
-	cls  \
-	diff \
-	fmt  \
-	gz   \
-	ist  \
-	ltx  \
-	pdf  \
-	sty  \
-	zip
-
-################################################################
-# Document settings                                            #
-################################################################
-
-PDFSETTINGS=\pdfminorversion=5  \pdfobjcompresslevel=2
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(SCRIPTDIR)/%: $(SUPPORTDIR)/%
-	@cp -fp $< $@
-	@chmod +x $@
-
-$(TESTDIR)/%.dtx: $(SOURCEDIR)/%.dtx
-	@cp -fp $< $@
-
-$(TESTDIR)/%.ins: $(SOURCEDIR)/%.ins
-	@cp -fp $< $@
-
-$(TESTDIR)/%.lvt: $(TESTFILEDIR)/%.lvt
-	@cp -fp $< $@
-
-$(TESTDIR)/%.tex: $(SOURCEDIR)/%.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.tlg: $(TESTFILEDIR)/%.tlg
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# File copying: specials                                       #
-################################################################
-
-$(TESTDIR)/commands-check.tex: $(VALIDATEDIR)/commands-check.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/regression-test.tex: $(VALIDATEDIR)/regression-test.tex
-	@cp -fp $< $@	
-
-################################################################
-# File building: default actions                                #
-################################################################
-
-$(TESTDIR)/%.pdf: $(TESTDIR)/%.dtx
-	NAME=`basename $< .dtx` ; \
-	echo "Typesetting $$NAME" ; \
-	cd $(TESTDIR) ; \
-	pdflatex -draftmode -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	if [ $$? = 0 ] ; then  \
-	  makeindex -s l3doc.ist -o $$NAME.ind $$NAME.idx > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  if [ `grep 'defined but not documented' $$NAME.log | wc -l` -ne 0 ] ; then \
-	    echo "! Warning: some functions defined but not documented" ; \
-	  fi ; \
-	  if [ `grep 'documented but not defined' $$NAME.log | wc -l` -ne 0 ]  ; then \
-	    echo "! Warning: some functions documented but not defined" ; \
-	  fi ; \
-	else \
-	  echo "  Compilation failed" ; \
-	fi ; \
-	for I in $(AUXFILES) ; do \
-	  rm -f $$NAME.$$I ; \
-	done
-
-################################################################
-# Internal make options                                        #
-################################################################
-
-.PHONY = \
-	expl3 \
-	support
-
-expl3:
-	cd $(EXPL3DIR) ; \
-	make localinstall
-
-support: \
-	$(foreach FILE,$(SCRIPTS),$(SCRIPTDIR)/$(FILE))  \
-	$(foreach FILE,$(VALIDATE),$(TESTDIR)/$(FILE))
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	checklvt     \
-	clean        \
-	cleanall     \
-	doc          \
-	localinstall \
-	savetlg      \
-	test         \
-	unpack
-
-clean:
-	echo "Cleaning up"
-	rm -rf $(TESTDIR)/*.*
-
-cleanall: clean
-	for I in $(AUXFILES) $(CLEAN) ; do \
-	  rm -f *.$$I ; \
-	done
-
-check: \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).lvt) \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).tlg) \
-	expl3 support unpack
-	echo "Running checks on"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	for I in $(CHECKFILES) ; do \
-	  echo "  $$I" ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  perl $(SCRIPTDIR)/log2tlg $$I < $$I.log > $$I.new.log ; \
-	  if !(cmp -s $$I.tlg $$I.new.log) ; then \
-	    diff -c $$I.tlg $$I.new.log > $$I.diff ; \
-	  fi ; \
-	  for J in $(AUXFILES) lvt pdf tlg ; do \
-	    rm -f $$I.$$J ; \
-	  done ; \
-	done ; \
-	if (ls *.diff > /dev/null) ; then \
-	  echo "  Check failed with difference files" ; \
-	  for I in *.diff ; do \
-	    echo "  - " `pwd`"/$$I" ; \
-	  done ; \
-	else \
-	  echo "  All checks passed" ; \
-	fi
-
-checklvt: $(TESTDIR)/$(F).lvt $(TESTDIR)/$(F).tlg support unpack
-	echo "Running checks on $(F)"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).new.log ; \
-	if !(cmp -s $(F).tlg $(F).new.log) ; then \
-	  diff -c $(F).new.log $(F).tlg > $(F).diff ; \
-	fi ; \
-	for I in $(AUXFILES) lvt pdf tlg ; do \
-	  rm -f $(F).$$I ; \
-	done ; \
-	if (test -f $(F).diff) ; then \
-	  echo "  Check failed" ; \
-	  more `pwd`/$(F).diff ; \
-	else \
-	  echo "  Check passed" ; \
-	fi
-
-doc: $(foreach FILE,$(DTXFILES),$(TESTDIR)/$(FILE).pdf)
-
-localinstall: unpack
-	echo "Installing files"
-	TEXMFHOME=`kpsewhich --var-value=TEXMFHOME` ; \
-	mkdir -p $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	rm -rf $$TEXMFHOME/tex/$(PACKAGEROOT)/* ; \
-	cd $(TESTDIR) ; \
-	cp *.sty $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	texhash > /dev/null
-
-savetlg: $(TESTDIR)/$(F).lvt support unpack
-	echo "Creating and copying $(F).tlg"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	rm -f $$I.pdf ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).tlg
-	cp -f $(TESTDIR)/$(F).tlg $(TESTFILEDIR)/$(F).tlg
-
-test: \
-	$(foreach FILE,$(TESTFILES),$(TESTDIR)/$(FILE).tex) \
-	expl3 unpack
-	echo "Testing files"
-	cd $(TESTDIR) ;\
-	for I in $(TESTFILES) ; do \
-	  echo " $$I" ; \
-	  pdflatex  $$I ; \
-	done
-
-unpack: $(foreach FILE,$(DTX) $(TEX) $(UNPACK),$(TESTDIR)/$(FILE))
-	echo "Unpacking files"
-	cd $(TESTDIR) ; \
-	for I in $(UNPACK) ; do \
-	  tex $$I > /dev/null ; \
-	done
diff --git a/xpackages/xhead/firstattempt/Makefile b/xpackages/xhead/firstattempt/Makefile
deleted file mode 100644
index 677038e..0000000
--- a/xpackages/xhead/firstattempt/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-all:	xbase getl3 unpack
-
-xbase:
-	(cd ../xbase; latex xbase.ins)
-	mv ../xbase/*.sty .
-
-getl3:
-	(cd ../../l3in2e ; latex l3.ins )
-	mv ../../l3in2e/*.sty .
-
-unpack:
-	latex xhead.ins
-
-clean:
-	rm -f *.sty *.sig *.dvi *.aux *.log *.toc *.lot *~
-	rm -f l3in2e.err
-
-test:
-	latex tryxhead
-
-check: xbase getl3 unpack test clean
diff --git a/xpackages/xhead/firstattempt/make.bat b/xpackages/xhead/firstattempt/make.bat
deleted file mode 100644
index 243782b..0000000
--- a/xpackages/xhead/firstattempt/make.bat
+++ /dev/null
@@ -1,135 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi log toc
-set CLEAN=pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set TEST=tryxhead
-set XBASEDIR=..\xbase
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "check"  goto :check
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "test"   goto :test
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins > temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins > temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-
-  goto :unpack-int
-
-:check
-
-  set NEXT=check-return
-  goto :all-int
-  
-:check-return
-
-  set NEXT=clean
-  goto :test-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-    
-  goto :end
-  
-:doc
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make check              - set up and run all test files
-  echo  make doc                - typeset all dtx files
-  echo  make test               - run all test files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:test
-
-  set NEXT=clean-int
-
-:test-int
-
-  for %%I in (%TEST%) do (
-    echo   %%I
-    pdflatex -interaction=batchmode %%I > temp.log
-    if not ERRORLEVEL 0 (
-      echo.
-      echo **********************
-      echo * Compilation failed *
-      echo **********************
-      echo.
-    )
-  )
-
-  goto :%NEXT%  
-
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file
diff --git a/xpackages/xhead/make.bat b/xpackages/xhead/make.bat
deleted file mode 100644
index 43494cc..0000000
--- a/xpackages/xhead/make.bat
+++ /dev/null
@@ -1,241 +0,0 @@
- at echo off
-rem This Windows batch file provides very similar functionality to the
-rem Makefile also available here.  Some of the options provided here 
-rem require a zip program such as Info-ZIP (http://www.info-zip.org).
-
-setlocal
-
-set AUXFILES=aux cmds glo hd idx ilg ind log lvt tlg toc out
-set CLEAN=fc gz pdf sty
-set EXPL3DIR=..\..\l3in2e
-set PACKAGE=xhead
-set PDFSETTINGS=\pdfminorversion=5  \pdfobjcompresslevel=2 \AtBeginDocument{\DisableImplementation}
-set SCRIPTDIR=..\..\support
-set TEST=xhead-test
-set TESTDIR=testfiles
-set TDSROOT=latex\xpackages\%PACKAGE%
-set VALIDATE=..\..\validate
-
-:loop
-
-  if /i [%1] == [all]          goto :all
-  if /i [%1] == [check]        goto :check
-  if /i [%1] == [clean]        goto :clean
-  if /i [%1] == [doc]          goto :doc
-  if /i [%1] == [localinstall] goto :localinstall
-  if /i [%1] == [savetlg]      goto :savetlg
-  if /i [%1] == [test]         goto :test
-  if /i [%1] == [unpack]       goto :unpack
-
-  goto :help
-
-:all
-
-  pushd %EXPL3DIR%
-  call make unpack
-  popd 
-  xcopy /q /y %EXPL3DIR%\*.sty > nul
-  pushd %EXPL3DIR%
-  call make clean
-  popd
-
-  goto :unpack
-
-
-:check
-
-  call :unpack
-  call :perl
-  
-  xcopy /q /y %SCRIPTDIR%\log2tlg            > nul
-  xcopy /q /y %VALIDATE%\regression-test.tex > nul
-  
-  if exist *.fc  del /q *.fc
-  if exist *.lvt del /q *.lvt
-  if exist *.tlg del /q *.tlg
-  for %%I in (%TESTDIR%\*.tlg) do (
-    if exist %TESTDIR%\%%~nI.lvt (
-      xcopy /q /y %TESTDIR%\%%~nI.lvt > nul
-      xcopy /q /y %TESTDIR%\%%~nI.tlg > nul
-    )
-  )
-  
-  echo.
-  echo Running checks on
-  
-  for %%I in (*.tlg) do (
-    echo   %%~nI
-    pdflatex %%~nI.lvt > nul
-    pdflatex %%~nI.lvt > nul
-    %PERLEXE% log2tlg %%~nI < %%~nI.log > %%~nI.new.log 
-    del /q %%~nI.log > nul
-    ren %%~nI.new.log %%~nI.log > nul
-    fc /n  %%~nI.log %%~nI.tlg > %%~nI.fc
-  )
-  
-  for %%I in (*.fc) do (
-    for /f "skip=1 tokens=1" %%J in (%%~nI.fc) do (
-      if "%%J" == "FC:" (
-        del /q %%I
-      )
-    )
-  )
-  
-  echo.
-  if exist *.fc (
-    echo   Checks fails for
-    for %%I in (*.fc) do (
-      echo   - %%~nI
-    ) 
-  ) else (
-    echo   All checks passed
-  )
-  
-  for %%I in (*.tlg) do (
-    if exist %%~nI.pdf del /q %%~nI.pdf
-  )
-  
-  goto :clean-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-
-  if exist log2tlg del /q log2tlg
-  if exist regression-test.tex del /q regression-test.tex
-
-  goto :end
-
-:doc
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode -draftmode "%PDFSETTINGS% \input %%I" > nul
-    if not ERRORLEVEL 1 (
-      if exist %%~nI.idx (
-        makeindex -q -s l3doc.ist -o %%~nI.ind %%~nI.idx > nul
-      )
-      pdflatex -interaction=nonstopmode "%PDFSETTINGS% \input %%I" > nul
-      pdflatex -interaction=nonstopmode "%PDFSETTINGS% \input %%I" > nul
-    )
-  )
-
-  goto :clean-int
-
-:help
-
-  echo.
-  echo  make all          - extract modules plus expl3
-  echo  make clean        - clean out directory
-  echo  make check        - run automated check system
-  echo  make doc          - typeset all dtx files
-  echo  make localinstall - locally install packages
-  echo  make savetlg ^<name^> - save test log for ^<name^>
-  echo  make test         - run test doucments
-  echo  make unpack       - extract modules
-  
-  goto :end
-
-:localinstall
-
-  echo.
-  echo Installing files
-
-  if not defined TEXMFHOME (
-    set TEXMFHOME=%USERPROFILE%\texmf
-  )
-  set INSTALLROOT=%TEXMFHOME%\tex\%TDSROOT%
-
-  if exist "%INSTALLROOT%\*.*" rmdir /q /s "%INSTALLROOT%"
-
-  call make unpack
-  xcopy /q /y *.sty "%INSTALLROOT%\"   > nul 
-  call make clean
-
-  goto :end
-
-:perl 
-
-  set PATHCOPY=%PATH%
-
-:perl-loop
-
-  if defined PERLEXE goto :EOF
-  
-  for /f "delims=; tokens=1,2*" %%I in ("%PATHCOPY%") do (
-    if exist %%I\perl.exe set PERLEXE=perl
-    set PATHCOPY=%%J;%%K
-  )
-  
-  if defined PERLEXE goto :EOF
-
-  if not "%PATHCOPY%"==";" goto :perl-loop
-  
-  if exist %SYSTEMROOT%\Perl\bin\perl.exe set PERLEXE=%SYSTEMROOT%\Perl\bin\perl
-  if exist %ProgramFiles%\Perl\bin\perl.exe set PERLEXE=%ProgramFiles%\Perl\bin\perl
-  if exist %SYSTEMROOT%\strawberry\Perl\bin\perl.exe set PERLEXE=%SYSTEMROOT%\strawberry\Perl\bin\perl
-  
-  if defined PERL goto :EOF
-  
-  echo.
-  echo  This procedure requires Perl, but it could not be found.
-  
-  goto :EOF
-
-:savetlg
-
-  shift
-  if [%1] == [] goto :help
-  if not exist %TESTDIR%\%1.lvt goto :no-lvt
-
-  call :perl
-  call :unpack
- 
-  xcopy /q /y %SCRIPTDIR%\log2tlg > nul
-  xcopy /q /y %VALIDATE%\regression-test.tex > nul
-  xcopy /q /y %TESTDIR%\%1.lvt > nul
-  
-  echo.
-  echo Creating and copying %1.tlg
-  
-  pdflatex %1.lvt > nul
-  pdflatex %1.lvt > nul
-  %PERLEXE% log2tlg %1 < %1.log > %1.tlg
-  copy /y %1.tlg %TESTDIR%\%1.tlg > nul
-  
-  goto :clean-int
-
-:test
-
-  call :all
-
-  for %%I in (%TEST%) do (
-    echo   %%I
-    pdflatex -interaction=batchmode %%I > nul
-    if not [%ERRORLEVEL%] == [0] (
-      echo.
-      echo **********************
-      echo * Compilation failed *
-      echo **********************
-      echo.
-    ) 
-  )
-
-  goto :end
-
-:unpack
-
-  for %%I in (*.ins) do (
-    tex %%I > nul
-  )
-
-  goto :end
-
-:end
-
-  shift
-  if not [%1] == [] goto :loop
\ No newline at end of file
diff --git a/xpackages/xinitials/Makefile b/xpackages/xinitials/Makefile
deleted file mode 100644
index 8ed291b..0000000
--- a/xpackages/xinitials/Makefile
+++ /dev/null
@@ -1,302 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "xinitials" files                            #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check            - runs automated test suite"
-	@echo " make checklvt F=<name>   - runs automated test on <name>"
-	@echo " make clean            - clean out test directory"
-	@echo " make cleanall         - clean out test and current directory"
-	@echo " make doc              - typeset documentation"
-	@echo " make localinstall     - install files in local texmf tree"
-	@echo " make savetlg F=<name> - save test log for <name>"
-	@echo " make test             - typeset test files"
-	@echo " make unpack           - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xpackages/xinitials
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ../..
-EXPL3DIR    := $(BASEDIR)/l3in2e
-SUPPORTDIR  := $(BASEDIR)/support
-TESTFILEDIR := $(SOURCEDIR)/testfiles
-VALIDATEDIR := $(BASEDIR)/validate
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-SCRIPTDIR  := $(shell test -d $(L3TESTDIR)/scripts || mkdir -p $(L3TESTDIR)/scripts ; cd $(L3TESTDIR)/scripts ; pwd)
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(PACKAGE) ; pwd)
-TESTAUXDIR := $(shell test -d $(TESTDIR)/testfiles || mkdir -p $(TESTDIR)/testfiles ; cd $(TESTDIR)/testfiles ; pwd)
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-DTX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-DTXFILES  = $(subst .dtx,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-TESTFILES = template-test template-test2 tprestrict-test xparse-test
-TEX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.tex)))
-UNPACK    = xinitials.ins
-
-##############################################################
-# Files for the check systems                                #
-##############################################################
-
-CHECKFILES = $(subst .tlg,,$(notdir $(wildcard $(TESTFILEDIR)/*.tlg)))
-SCRIPTS    = log2tlg
-VALIDATE   = commands-check.tex regression-test.tex
-
-##############################################################
-# Clean-up information                                       #
-##############################################################
-
-AUXFILES = \
-	aux  \
-	cmds \
-	glo  \
-	gls  \
-	hd   \
-	idx  \
-	ilg  \
-	ind  \
-	log  \
-	out  \
-	tmp  \
-	toc  \
-	xref
-
-CLEAN = \
-	cls  \
-	diff \
-	fmt  \
-	gz   \
-	ist  \
-	ltx  \
-	pdf  \
-	sty  \
-	zip
-
-################################################################
-# Document settings                                            #
-################################################################
-
-PDFSETTINGS=\pdfminorversion=5  \pdfobjcompresslevel=2
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(SCRIPTDIR)/%: $(SUPPORTDIR)/%
-	@cp -fp $< $@
-	@chmod +x $@
-
-$(TESTDIR)/%.dtx: $(SOURCEDIR)/%.dtx
-	@cp -fp $< $@
-
-$(TESTDIR)/%.ins: $(SOURCEDIR)/%.ins
-	@cp -fp $< $@
-
-$(TESTDIR)/%.lvt: $(TESTFILEDIR)/%.lvt
-	@cp -fp $< $@
-
-$(TESTDIR)/%.tex: $(SOURCEDIR)/%.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.tlg: $(TESTFILEDIR)/%.tlg
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# File copying: specials                                       #
-################################################################
-
-$(TESTDIR)/commands-check.tex: $(VALIDATEDIR)/commands-check.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/regression-test.tex: $(VALIDATEDIR)/regression-test.tex
-	@cp -fp $< $@	
-
-################################################################
-# File building: default actions                                #
-################################################################
-
-$(TESTDIR)/%.pdf: $(TESTDIR)/%.dtx
-	NAME=`basename $< .dtx` ; \
-	echo "Typesetting $$NAME" ; \
-	cd $(TESTDIR) ; \
-	pdflatex -draftmode -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	if [ $$? = 0 ] ; then  \
-	  makeindex -s l3doc.ist -o $$NAME.ind $$NAME.idx > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  if [ `grep 'defined but not documented' $$NAME.log | wc -l` -ne 0 ] ; then \
-	    echo "! Warning: some functions defined but not documented" ; \
-	  fi ; \
-	  if [ `grep 'documented but not defined' $$NAME.log | wc -l` -ne 0 ]  ; then \
-	    echo "! Warning: some functions documented but not defined" ; \
-	  fi ; \
-	else \
-	  echo "  Compilation failed" ; \
-	fi ; \
-	for I in $(AUXFILES) ; do \
-	  rm -f $$NAME.$$I ; \
-	done
-
-################################################################
-# Internal make options                                        #
-################################################################
-
-.PHONY = \
-	expl3 \
-	support
-
-expl3:
-	cd $(EXPL3DIR) ; \
-	make localinstall
-
-support: \
-	$(foreach FILE,$(SCRIPTS),$(SCRIPTDIR)/$(FILE))  \
-	$(foreach FILE,$(VALIDATE),$(TESTDIR)/$(FILE))
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	checklvt     \
-	clean        \
-	cleanall     \
-	doc          \
-	localinstall \
-	savetlg      \
-	test         \
-	unpack
-
-clean:
-	echo "Cleaning up"
-	rm -rf $(TESTDIR)/*.*
-
-cleanall: clean
-	for I in $(AUXFILES) $(CLEAN) ; do \
-	  rm -f *.$$I ; \
-	done
-
-check: \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).lvt) \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).tlg) \
-	expl3 support unpack
-	echo "Running checks on"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	for I in $(CHECKFILES) ; do \
-	  echo "  $$I" ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  perl $(SCRIPTDIR)/log2tlg $$I < $$I.log > $$I.new.log ; \
-	  if !(cmp -s $$I.tlg $$I.new.log) ; then \
-	    diff -c $$I.tlg $$I.new.log > $$I.diff ; \
-	  fi ; \
-	  for J in $(AUXFILES) lvt tlg ; do \
-	    rm -f $$I.$$J ; \
-	  done ; \
-	done ; \
-	if (ls *.diff > /dev/null) ; then \
-	  echo "  Check failed with difference files" ; \
-	  for I in *.diff ; do \
-	    echo "  - " `pwd`"/$$I" ; \
-	  done ; \
-	else \
-	  echo "  All checks passed" ; \
-	fi
-
-checklvt: $(TESTDIR)/$(F).lvt $(TESTDIR)/$(F).tlg support unpack
-	echo "Running checks on $(F)"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).new.log ; \
-	if !(cmp -s $(F).tlg $(F).new.log) ; then \
-	  diff -c $(F).new.log $(F).tlg > $(F).diff ; \
-	fi ; \
-	for I in $(AUXFILES) lvt pdf tlg ; do \
-	  rm -f $(F).$$I ; \
-	done ; \
-	if (test -f $(F).diff) ; then \
-	  echo "  Check failed" ; \
-	  more `pwd`/$(F).diff ; \
-	else \
-	  echo "  Check passed" ; \
-	fi
-
-doc: $(foreach FILE,$(DTXFILES),$(TESTDIR)/$(FILE).pdf)
-
-localinstall: unpack
-	echo "Installing files"
-	TEXMFHOME=`kpsewhich --var-value=TEXMFHOME` ; \
-	mkdir -p $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	rm -rf $$TEXMFHOME/tex/$(PACKAGEROOT)/* ; \
-	cd $(TESTDIR) ; \
-	cp *.sty *.sig $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	texhash > /dev/null
-
-savetlg: $(TESTDIR)/$(F).lvt support unpack
-	echo "Creating and copying $(F).tlg"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	rm -f $$I.pdf ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).tlg
-	cp -f $(TESTDIR)/$(F).tlg $(TESTFILEDIR)/$(F).tlg
-
-test: \
-	$(foreach FILE,$(TESTFILES),$(TESTDIR)/$(FILE).tex) \
-	expl3 unpack
-	echo "Testing files"
-	cd $(TESTDIR) ;\
-	for I in $(TESTFILES) ; do \
-	  echo " $$I" ; \
-	  pdflatex  $$I ; \
-	done
-
-unpack: $(foreach FILE,$(DTX) $(TEX) $(UNPACK),$(TESTDIR)/$(FILE))
-	echo "Unpacking files"
-	cd $(TESTDIR) ; \
-	for I in $(UNPACK) ; do \
-	  tex $$I > /dev/null ; \
-	done
diff --git a/xpackages/xinitials/make.bat b/xpackages/xinitials/make.bat
deleted file mode 100644
index 9f381b4..0000000
--- a/xpackages/xinitials/make.bat
+++ /dev/null
@@ -1,135 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi log sig toc
-set CLEAN=pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set TEST=xinitials-test
-set XBASEDIR=..\xbase
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "check"  goto :check
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "test"   goto :test
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins > temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins > temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-
-  goto :unpack-int
-
-:check
-
-  set NEXT=check-return
-  goto :all-int
-  
-:check-return
-
-  set NEXT=clean
-  goto :test-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-  
-  goto :end
-  
-:doc
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make check              - set up and run all test files
-  echo  make doc                - typeset all dtx files
-  echo  make test               - run all test files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:test
-
-  set NEXT=clean-int
-
-:test-int
-
-  for %%I in (%TEST%) do (
-    echo   %%I
-    pdflatex -interaction=batchmode %%I > temp.log
-    if not ERRORLEVEL 0 (
-      echo.
-      echo **********************
-      echo * Compilation failed *
-      echo **********************
-      echo.
-    )
-  )
-
-  goto :%NEXT%  
-
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file
diff --git a/xpackages/xlang/Makefile b/xpackages/xlang/Makefile
deleted file mode 100644
index ba8e488..0000000
--- a/xpackages/xlang/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-
-all:	xbase xor getl3 unpack
-
-xbase:
-	(cd ../xbase; latex xbase.ins)
-	mv ../xbase/*.sty .
-
-getl3:
-	(cd ../../l3in2e ; latex l3.ins )
-	mv ../../l3in2e/*.sty .
-
-xor:
-	(cd ../xor; latex xo.ins)
-	mv ../xor/xmarks.sty       .
-	mv ../xor/xo-alloc.sty     .
-	mv ../xor/xo-capt.sty      .
-	mv ../xor/xo-final.sty     .
-	mv ../xor/xo-float.sty     .
-	mv ../xor/xo-grid.sty      .
-	mv ../xor/xo-here.sty      .
-	mv ../xor/xo-new.sty       .
-	mv ../xor/xo-or.sty        .
-	mv ../xor/xo-footnote.sty  .
-	mv ../xor/xo-page.sty      .
-	mv ../xor/xo-place.sty     .
-	mv ../xor/xo-trace.sty     .
-	mv ../xor/xo-pagestyle.sty .
-	mv ../xor/xoutput.sty      .
-	mv ../xor/l3stuff.sty      .
-
-unpack:
-	latex xlang.ins
-
-clean:
-	rm -f *.sty *.dvi *.aux *.log *.toc *.idx *~
-	rm -f german.xld l3in2e.err
-
-test:
-	latex xlang-test
-
-check: xbase getl3 xor unpack test clean
diff --git a/xpackages/xlang/make.bat b/xpackages/xlang/make.bat
deleted file mode 100644
index c7e65c5..0000000
--- a/xpackages/xlang/make.bat
+++ /dev/null
@@ -1,146 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi log toc xld
-set CLEAN=pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set TEST=xlang-test
-set XBASEDIR=..\xbase
-set XOR3DIR=..\xor
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "check"  goto :check
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "test"   goto :test
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins > temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins > temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XOR3DIR%
-  tex xor.ins > temp.log
-  popd
-  copy /y %XOR3DIR%\*.sty > temp.log
-  pushd %XOR3DIR%
-  ren template-doc.sty template-doc.xxx > temp.log
-  del /q *.sty *.log
-  ren template-doc.xxx template-doc.sty > temp.log
-  popd
-
-  goto :unpack-int
-
-:check
-
-  set NEXT=check-return
-  goto :all-int
-  
-:check-return
-
-  set NEXT=clean
-  goto :test-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-    
-  goto :end
-  
-:doc
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make check              - set up and run all test files
-  echo  make doc                - typeset all dtx files
-  echo  make test               - run all test files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:test
-
-  set NEXT=clean-int
-
-:test-int
-
-  for %%I in (%TEST%) do (
-    echo   %%I
-    pdflatex -interaction=batchmode %%I > temp.log
-    if not ERRORLEVEL 0 (
-      echo.
-      echo **********************
-      echo * Compilation failed *
-      echo **********************
-      echo.
-    )
-  )
-
-  goto :%NEXT%  
-
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file
diff --git a/xpackages/xlists/Makefile b/xpackages/xlists/Makefile
deleted file mode 100644
index fc43b4a..0000000
--- a/xpackages/xlists/Makefile
+++ /dev/null
@@ -1,302 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "xlists" files                            #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check            - runs automated test suite"
-	@echo " make checklvt F=<name>   - runs automated test on <name>"
-	@echo " make clean            - clean out test directory"
-	@echo " make cleanall         - clean out test and current directory"
-	@echo " make doc              - typeset documentation"
-	@echo " make localinstall     - install files in local texmf tree"
-	@echo " make savetlg F=<name> - save test log for <name>"
-	@echo " make test             - typeset test files"
-	@echo " make unpack           - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xpackages/xlists
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ../..
-EXPL3DIR    := $(BASEDIR)/l3in2e
-SUPPORTDIR  := $(BASEDIR)/support
-TESTFILEDIR := $(SOURCEDIR)/testfiles
-VALIDATEDIR := $(BASEDIR)/validate
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-SCRIPTDIR  := $(shell test -d $(L3TESTDIR)/scripts || mkdir -p $(L3TESTDIR)/scripts ; cd $(L3TESTDIR)/scripts ; pwd)
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(PACKAGE) ; pwd)
-TESTAUXDIR := $(shell test -d $(TESTDIR)/testfiles || mkdir -p $(TESTDIR)/testfiles ; cd $(TESTDIR)/testfiles ; pwd)
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-DTX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-DTXFILES  = $(subst .dtx,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-TESTFILES = template-test template-test2 tprestrict-test xparse-test
-TEX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.tex)))
-UNPACK    = xlists.ins
-
-##############################################################
-# Files for the check systems                                #
-##############################################################
-
-CHECKFILES = $(subst .tlg,,$(notdir $(wildcard $(TESTFILEDIR)/*.tlg)))
-SCRIPTS    = log2tlg
-VALIDATE   = commands-check.tex regression-test.tex
-
-##############################################################
-# Clean-up information                                       #
-##############################################################
-
-AUXFILES = \
-	aux  \
-	cmds \
-	glo  \
-	gls  \
-	hd   \
-	idx  \
-	ilg  \
-	ind  \
-	log  \
-	out  \
-	tmp  \
-	toc  \
-	xref
-
-CLEAN = \
-	cls  \
-	diff \
-	fmt  \
-	gz   \
-	ist  \
-	ltx  \
-	pdf  \
-	sty  \
-	zip
-
-################################################################
-# Document settings                                            #
-################################################################
-
-PDFSETTINGS=\pdfminorversion=5  \pdfobjcompresslevel=2
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(SCRIPTDIR)/%: $(SUPPORTDIR)/%
-	@cp -fp $< $@
-	@chmod +x $@
-
-$(TESTDIR)/%.dtx: $(SOURCEDIR)/%.dtx
-	@cp -fp $< $@
-
-$(TESTDIR)/%.ins: $(SOURCEDIR)/%.ins
-	@cp -fp $< $@
-
-$(TESTDIR)/%.lvt: $(TESTFILEDIR)/%.lvt
-	@cp -fp $< $@
-
-$(TESTDIR)/%.tex: $(SOURCEDIR)/%.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.tlg: $(TESTFILEDIR)/%.tlg
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# File copying: specials                                       #
-################################################################
-
-$(TESTDIR)/commands-check.tex: $(VALIDATEDIR)/commands-check.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/regression-test.tex: $(VALIDATEDIR)/regression-test.tex
-	@cp -fp $< $@	
-
-################################################################
-# File building: default actions                                #
-################################################################
-
-$(TESTDIR)/%.pdf: $(TESTDIR)/%.dtx
-	NAME=`basename $< .dtx` ; \
-	echo "Typesetting $$NAME" ; \
-	cd $(TESTDIR) ; \
-	pdflatex -draftmode -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	if [ $$? = 0 ] ; then  \
-	  makeindex -s l3doc.ist -o $$NAME.ind $$NAME.idx > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  if [ `grep 'defined but not documented' $$NAME.log | wc -l` -ne 0 ] ; then \
-	    echo "! Warning: some functions defined but not documented" ; \
-	  fi ; \
-	  if [ `grep 'documented but not defined' $$NAME.log | wc -l` -ne 0 ]  ; then \
-	    echo "! Warning: some functions documented but not defined" ; \
-	  fi ; \
-	else \
-	  echo "  Compilation failed" ; \
-	fi ; \
-	for I in $(AUXFILES) ; do \
-	  rm -f $$NAME.$$I ; \
-	done
-
-################################################################
-# Internal make options                                        #
-################################################################
-
-.PHONY = \
-	expl3 \
-	support
-
-expl3:
-	cd $(EXPL3DIR) ; \
-	make localinstall
-
-support: \
-	$(foreach FILE,$(SCRIPTS),$(SCRIPTDIR)/$(FILE))  \
-	$(foreach FILE,$(VALIDATE),$(TESTDIR)/$(FILE))
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	checklvt     \
-	clean        \
-	cleanall     \
-	doc          \
-	localinstall \
-	savetlg      \
-	test         \
-	unpack
-
-clean:
-	echo "Cleaning up"
-	rm -rf $(TESTDIR)/*.*
-
-cleanall: clean
-	for I in $(AUXFILES) $(CLEAN) ; do \
-	  rm -f *.$$I ; \
-	done
-
-check: \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).lvt) \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).tlg) \
-	expl3 support unpack
-	echo "Running checks on"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	for I in $(CHECKFILES) ; do \
-	  echo "  $$I" ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  perl $(SCRIPTDIR)/log2tlg $$I < $$I.log > $$I.new.log ; \
-	  if !(cmp -s $$I.tlg $$I.new.log) ; then \
-	    diff -c $$I.tlg $$I.new.log > $$I.diff ; \
-	  fi ; \
-	  for J in $(AUXFILES) lvt tlg ; do \
-	    rm -f $$I.$$J ; \
-	  done ; \
-	done ; \
-	if (ls *.diff > /dev/null) ; then \
-	  echo "  Check failed with difference files" ; \
-	  for I in *.diff ; do \
-	    echo "  - " `pwd`"/$$I" ; \
-	  done ; \
-	else \
-	  echo "  All checks passed" ; \
-	fi
-
-checklvt: $(TESTDIR)/$(F).lvt $(TESTDIR)/$(F).tlg support unpack
-	echo "Running checks on $(F)"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).new.log ; \
-	if !(cmp -s $(F).tlg $(F).new.log) ; then \
-	  diff -c $(F).new.log $(F).tlg > $(F).diff ; \
-	fi ; \
-	for I in $(AUXFILES) lvt pdf tlg ; do \
-	  rm -f $(F).$$I ; \
-	done ; \
-	if (test -f $(F).diff) ; then \
-	  echo "  Check failed" ; \
-	  more `pwd`/$(F).diff ; \
-	else \
-	  echo "  Check passed" ; \
-	fi
-
-doc: $(foreach FILE,$(DTXFILES),$(TESTDIR)/$(FILE).pdf)
-
-localinstall: unpack
-	echo "Installing files"
-	TEXMFHOME=`kpsewhich --var-value=TEXMFHOME` ; \
-	mkdir -p $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	rm -rf $$TEXMFHOME/tex/$(PACKAGEROOT)/* ; \
-	cd $(TESTDIR) ; \
-	cp *.sty $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	texhash > /dev/null
-
-savetlg: $(TESTDIR)/$(F).lvt support unpack
-	echo "Creating and copying $(F).tlg"
-	cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	rm -f $$I.pdf ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).tlg
-	cp -f $(TESTDIR)/$(F).tlg $(TESTFILEDIR)/$(F).tlg
-
-test: \
-	$(foreach FILE,$(TESTFILES),$(TESTDIR)/$(FILE).tex) \
-	expl3 unpack
-	echo "Testing files"
-	cd $(TESTDIR) ;\
-	for I in $(TESTFILES) ; do \
-	  echo " $$I" ; \
-	  pdflatex  $$I ; \
-	done
-
-unpack: $(foreach FILE,$(DTX) $(TEX) $(UNPACK),$(TESTDIR)/$(FILE))
-	echo "Unpacking files"
-	cd $(TESTDIR) ; \
-	for I in $(UNPACK) ; do \
-	  tex $$I > /dev/null ; \
-	done
diff --git a/xpackages/xor/Makefile b/xpackages/xor/Makefile
deleted file mode 100644
index 2ef2a97..0000000
--- a/xpackages/xor/Makefile
+++ /dev/null
@@ -1,291 +0,0 @@
-################################################################
-################################################################
-# Makefile for LaTeX3 "xor" files                              #
-################################################################
-################################################################
-
-################################################################
-# Default with no target is to give help                       #
-################################################################
-
-help:
-	@echo ""
-	@echo " make check            - runs automated test suite"
-	@echo " make checklvt F=<name> - runs automated test on <name>"
-	@echo " make clean            - clean out test directory"
-	@echo " make cleanall         - clean out test and current directory"
-	@echo " make doc              - typeset documentation"
-	@echo " make localinstall     - install files in local texmf tree"
-	@echo " make savetlg F=<name> - save test log for <name>"
-	@echo " make unpack           - extract packages"
-	@echo ""
-
-##############################################################
-# Master package name                                        #
-##############################################################
-
-PACKAGE = xor
-L3DIR   = xpackages
-
-##############################################################
-# Directory structure for source files                       #
-##############################################################
-
-SOURCEDIR   := .
-BASEDIR     := ../..
-EXPL3DIR    := $(BASEDIR)/l3kernel
-SUPPORTDIR  := $(BASEDIR)/support
-TESTFILEDIR := $(SOURCEDIR)/testfiles
-
-##############################################################
-# Directory structure for test system                        #
-##############################################################
-
-L3TESTDIR  := /tmp/l3test
-SCRIPTDIR  := $(shell test -d $(L3TESTDIR)/scripts || mkdir -p $(L3TESTDIR)/scripts ; cd $(L3TESTDIR)/scripts ; pwd)
-TESTDIR    := $(shell test -d $(L3TESTDIR)/test/$(L3DIR)/$(PACKAGE) || mkdir -p $(L3TESTDIR)/test/$(L3DIR)/$(PACKAGE) ; cd $(L3TESTDIR)/test/$(L3DIR)/$(PACKAGE) ; pwd)
-TESTAUXDIR := $(shell test -d $(TESTDIR)/testfiles || mkdir -p $(TESTDIR)/testfiles ; cd $(TESTDIR)/testfiles ; pwd)
-
-##############################################################
-# Data for local installation and TDS construction           #
-##############################################################
-
-PACKAGEROOT := latex/$(L3DIR)/$(PACKAGE)
-
-##############################################################
-# Details of source files                                    #
-##############################################################
-
-DTX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-DTXFILES  = $(subst .dtx,,$(notdir $(wildcard $(SOURCEDIR)/*.dtx)))
-TEX       = $(subst ,,$(notdir $(wildcard $(SOURCEDIR)/*.tex)))
-UNPACK    = xotrace.ins
-
-##############################################################
-# Files for the check systems                                #
-##############################################################
-
-CHECKFILES = $(subst .tlg,,$(notdir $(wildcard $(TESTFILEDIR)/*.tlg)))
-SCRIPTS    = log2tlg
-VALIDATE   = regression-test.tex
-
-##############################################################
-# Clean-up information                                       #
-##############################################################
-
-AUXFILES = \
-	aux  \
-	cmds \
-	fpl  \
-	glo  \
-	gls  \
-	hd   \
-	idx  \
-	ilg  \
-	ind  \
-	log  \
-	out  \
-	tmp  \
-	toc  \
-	xref
-
-CLEAN = \
-	cls  \
-	diff \
-	fmt  \
-	gz   \
-	ist  \
-	ltx  \
-	pdf  \
-	sty  \
-	zip
-
-REVERT = xo-balance.pdf xo-pfloat.pdf template-doc.sty
-
-################################################################
-# Document settings                                            #
-################################################################
-
-PDFSETTINGS=\pdfminorversion=5  \pdfobjcompresslevel=2
-
-################################################################
-# File copying: default actions                                #
-################################################################
-
-$(SCRIPTDIR)/%: $(SUPPORTDIR)/%
-	@cp -fp $< $@
-	@chmod +x $@
-
-$(TESTDIR)/%.dtx: $(SOURCEDIR)/%.dtx
-	@cp -fp $< $@
-
-$(TESTDIR)/%.ins: $(SOURCEDIR)/%.ins
-	@cp -fp $< $@
-
-$(TESTDIR)/%.lvt: $(TESTFILEDIR)/%.lvt
-	@cp -fp $< $@
-
-$(TESTDIR)/%.tex: $(SOURCEDIR)/%.tex
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.tlg: $(TESTFILEDIR)/%.tlg
-	@cp -fp $< $@	
-
-$(TESTDIR)/%.txt: $(SOURCEDIR)/%.txt
-	@cp -fp $< $@	
-
-################################################################
-# File copying: specials                                       #
-################################################################
-
-$(TESTDIR)/regression-test.tex: $(SUPPORTDIR)/regression-test.tex
-	@cp -fp $< $@	
-
-################################################################
-# File building: default actions                                #
-################################################################
-
-$(TESTDIR)/%.pdf: $(TESTDIR)/%.dtx
-	@NAME=`basename $< .dtx` ; \
-	echo "Typesetting $$NAME" ; \
-	cd $(TESTDIR) ; \
-	pdflatex -draftmode -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	if [ $$? = 0 ] ; then  \
-	  makeindex -q -s l3doc.ist -o $$NAME.ind $$NAME.idx > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  pdflatex -interaction=nonstopmode "$(PDFSETTINGS) \input $<" > /dev/null ; \
-	  if [ `grep 'defined but not documented' $$NAME.log | wc -l` -ne 0 ] ; then \
-	    echo "! Warning: some functions defined but not documented" ; \
-	  fi ; \
-	  if [ `grep 'documented but not defined' $$NAME.log | wc -l` -ne 0 ]  ; then \
-	    echo "! Warning: some functions documented but not defined" ; \
-	  fi ; \
-	else \
-	  echo "  Compilation failed" ; \
-	fi ; \
-	for I in $(AUXFILES) ; do \
-	  rm -f $$NAME.$$I ; \
-	done
-
-################################################################
-# Internal make options                                        #
-################################################################
-
-.PHONY = \
-	support
-
-support: \
-	$(foreach FILE,$(SCRIPTS),$(SCRIPTDIR)/$(FILE))  \
-	$(foreach FILE,$(VALIDATE),$(TESTDIR)/$(FILE))
-
-################################################################
-# User make options                                            #
-################################################################
-
-.PHONY = \
-	check        \
-	checklvt     \
-	clean        \
-	cleanall     \
-	doc          \
-	localinstall \
-	savetlg      \
-	test         \
-	unpack
-
-clean:
-	@echo "Cleaning up"
-	rm -rf $(TESTDIR)/*
-
-
-cleanall: clean
-	for I in $(AUXFILES) $(CLEAN) ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	for I in $(REVERT) ; do \
-	  svn revert $$I ; \
-	done
-
-check: \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).lvt) \
-	$(foreach FILE,$(CHECKFILES),$(TESTDIR)/$(FILE).tlg) \
-	support unpack
-	@echo "Running checks on"
-	@cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	for I in $(CHECKFILES) ; do \
-	  echo "  $$I" ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  pdflatex $$I.lvt > /dev/null ; \
-	  perl $(SCRIPTDIR)/log2tlg $$I < $$I.log > $$I.new.log ; \
-	  if !(cmp -s $$I.tlg $$I.new.log) ; then \
-	    diff -c $$I.tlg $$I.new.log > $$I.diff ; \
-	  fi ; \
-	  for J in $(AUXFILES) lvt tlg ; do \
-	    rm -f $$I.$$J ; \
-	  done ; \
-	done ; \
-	if [ `ls -1 *.diff 2>/dev/null | wc -l` != 0 ] ; then \
-	  echo "  Check failed with difference files" ; \
-	  for I in *.diff ; do \
-	    echo "  - " `pwd`"/$$I" ; \
-	  done ; \
-	else \
-	  echo "  All checks passed" ; \
-	fi
-
-checklvt: $(TESTDIR)/$(F).lvt $(TESTDIR)/$(F).tlg support unpack
-	@echo "Running checks on $(F)"
-	@cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).new.log ; \
-	if !(cmp -s $(F).tlg $(F).new.log) ; then \
-	  diff -c $(F).new.log $(F).tlg > $(F).diff ; \
-	fi ; \
-	for I in $(AUXFILES) lvt pdf tlg ; do \
-	  rm -f $(F).$$I ; \
-	done ; \
-	if (test -f $(F).diff) ; then \
-	  echo "  Check failed" ; \
-	  more `pwd`/$(F).diff ; \
-	else \
-	  echo "  Check passed" ; \
-	fi
-
-doc: unpack $(foreach FILE,$(DTXFILES),$(TESTDIR)/$(FILE).pdf)
-
-localinstall: unpack
-	@echo "Installing files"
-	@TEXMFHOME=`kpsewhich --var-value=TEXMFHOME` ; \
-	mkdir -p $$TEXMFHOME/tex/$(PACKAGEROOT)/ ; \
-	rm -rf $$TEXMFHOME/tex/$(PACKAGEROOT)/* ; \
-	cd $(TESTDIR) ; \
-	cp *.sty $$TEXMFHOME/tex/$(PACKAGEROOT)/
-
-savetlg: $(TESTDIR)/$(F).lvt support unpack
-	@echo "Creating and copying $(F).tlg"
-	@cd $(TESTDIR) ; \
-	for I in $(AUXFILES) diff ; do \
-	  rm -f *.$$I ; \
-	done ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	pdflatex $(F).lvt > /dev/null ; \
-	rm -f $$I.pdf ; \
-	perl $(SCRIPTDIR)/log2tlg $(F) < $(F).log > $(F).tlg
-	cp -f $(TESTDIR)/$(F).tlg $(TESTFILEDIR)/$(F).tlg
-
-unpack: $(foreach FILE,$(DTX) $(TEX) $(UNPACK),$(TESTDIR)/$(FILE))
-	@echo "Unpacking files"
-	@cd $(TESTDIR) ; \
-	for I in $(UNPACK) ; do \
-	  tex $$I > /dev/null ; \
-	done
diff --git a/xpackages/xor/make.bat b/xpackages/xor/make.bat
deleted file mode 100644
index e2c563d..0000000
--- a/xpackages/xor/make.bat
+++ /dev/null
@@ -1,320 +0,0 @@
- at echo off
-
-rem Makefile for LaTeX3 "xor" files
-
-  if not [%1] == [] goto init
-
-:help
-
-  echo.
-  echo  make check [show]   - run automated check system
-  echo  make clean          - clean out directory
-  echo  make doc [show]     - typeset all dtx files
-  echo  make localinstall   - locally install package
-  echo  make savetlg ^<name^> - save test log for ^<name^>
-  echo  make unpack [show]  - extract modules
-  echo.
-  echo  The "show" option enables display of the output
-  echo  of the TeX runs in the terminal.
-
-  goto :EOF
-
-:init
-
-  rem Avoid clobbering anyone else's variables
-
-  setlocal
-
-  rem Safety precaution against awkward paths
-
-  cd /d "%~dp0"
-
-  rem The name of the module and the bundle it is part of
-
-  set BUNDLE=xpackages
-  set MODULE=xor
-
-  rem Unpacking information
-
-  set UNPACK=xo.ins
-
-  rem Clean up settings
-
-  set AUXFILES=aux cmds fpl glo hd idx ilg ind log lvt tlg toc out
-  set CLEAN=fc gz pdf sty
-  set NOCLEAN=xo-balance.pdf xo-pfloat.pdf template-doc.sty
-
-  rem Check system set up
-
-  set CHECKDIR=testfiles
-  set CHECKEXE=pdflatex
-  set CHECKRUNS=3
-  set CHECKUNPACK=xotrace.ins
-
-  rem Local installation settings
-
-  set INSTALLDIR=latex\%BUNDLE%\%MODULE%
-  set INSTALLFILES=*.sty
-
-  rem Documentation typesetting set up
-
-  set TYPESETEXE=pdflatex -interaction=nonstopmode
-
-  rem Locations for the various support items required
-
-  set MAINDIR=..\..
-  set KERNELDIR=%MAINDIR%\l3kernel
-  set SCRIPTDIR=%MAINDIR%\support
-
-  rem Set up redirection of output
-
-  set REDIRECT=^> nul
-  if not [%2] == [] (
-    if /i [%2] == [show] (
-      set REDIRECT=
-    )
-  )
-
-:main
-
-  if /i [%1] == [check]        goto check
-  if /i [%1] == [clean]        goto clean
-  if /i [%1] == [cleanall]     goto clean
-  if /i [%1] == [doc]          goto doc
-  if /i [%1] == [localinstall] goto localinstall
-  if /i [%1] == [savetlg]      goto savetlg
-  if /i [%1] == [unpack]       goto unpack
-
-  goto help
-
-:check
-
-  if not exist %CHECKDIR%\nul goto end
-
-  rem Check for Perl, and give up if it is not found
-
-  call :perl
-  if ERRORLEVEL 1 goto :EOF
-
-  rem Unpack, allowing for using a 'trace' version or similar
-
-  for %%I in (%CHECKUNPACK%) do (
-    tex %%I > nul
-  )
-
-  rem Remove any old files, and copy the test system into place
-
-  for %%I in (fc lvt tlg) do (
-    if exist *.%%I del /q *.%%I
-  )
-
-  copy /y %SCRIPTDIR%\log2tlg            > nul
-  copy /y %SCRIPTDIR%\regression-test.tex > nul
-
-  rem Copy all test files for which there is a matching reference log
-
-  for %%I in (%CHECKDIR%\*.lvt) do (
-    if exist %CHECKDIR%\%%~nI.tlg (
-      copy /y %CHECKDIR%\%%~nI.lvt > nul
-      copy /y %CHECKDIR%\%%~nI.tlg > nul
-    )
-  )
-
-  echo.
-  echo Running checks on
-
-  for %%I in (*.tlg) do (
-    echo   %%~nI
-    for /l %%J in (1,1,%CHECKRUNS%) do (
-        %CHECKEXE% %%~nI.lvt %REDIRECT%
-      )
-    %PERLEXE% log2tlg %%~nI < %%~nI.log > %%~nI.new.log
-    del /q %%~nI.log > nul
-    ren %%~nI.new.log %%~nI.log > nul
-    fc /n  %%~nI.log %%~nI.tlg > %%~nI.fc
-  )
-
-  for %%I in (*.fc) do (
-    for /f "skip=1 tokens=1" %%J in (%%~nI.fc) do (
-      if "%%J" == "FC:" (
-        del /q %%I
-      )
-    )
-  )
-
-  echo.
-
-  if exist *.fc (
-    echo   Checks fails for
-    for %%I in (*.fc) do (
-      echo   - %%~nI
-    )
-  ) else (
-    echo   All checks passed
-  )
-
-  for %%I in (*.tlg) do (
-    if exist %%~nI.pdf del /q %%~nI.pdf
-  )
-
-  goto clean-int
-
-:clean
-
-  for %%I in (%NOCLEAN%) do (
-    copy /y %%I %%I.bak > nul
-  )
-
-  for %%I in (%CLEAN%) do (
-    if exist *.%%I del /q *.%%I
-  )
-
-  for %%I in (%NOCLEAN%) do (
-    copy /y %%I.bak %%I > nul
-    del /q %%I.bak
-  )
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do (
-    if exist *.%%I del /q *.%%I
-  )
-
-  if exist log2tlg del /q log2tlg
-  if exist regression-test.tex del /q regression-test.tex
-
-  goto end
-
-:doc
-
-  echo.
-  echo Typesetting
-
-  for %%I in (*.dtx) do (
-    echo   %%I
-    %TYPESETEXE% -draftmode %%I %REDIRECT%
-    if ERRORLEVEL 1 (
-      echo   ! Compilation failed
-    ) else (
-      if exist %%~nI.idx (
-        makeindex -q -s l3doc.ist -o %%~nI.ind %%~nI.idx > nul
-      )
-      %TYPESETEXE% %%I %REDIRECT%
-      %TYPESETEXE% %%I %REDIRECT%
-    )
-  )
-
-  goto clean-int
-
-:localinstall
-
-  call :unpack
-
-  echo.
-  echo Installing files
-
-  rem Find local root if possible
-
-  if not defined TEXMFHOME (
-    for /f "delims=" %%I in ('kpsewhich --var-value=TEXMFHOME') do @set TEXMFHOME=%%I
-    if "%TEXMFHOME%" == "" (
-      set TEXMFHOME=%USERPROFILE%\texmf
-    )
-  )
-
-  set INSTALLROOT=%TEXMFHOME%\tex\%INSTALLDIR%
-
-  if exist "%INSTALLROOT%\*.*" rmdir /q /s "%INSTALLROOT%"
-  mkdir "%INSTALLROOT%"
-
-  for %%I in (%INSTALLFILES%) do (
-    copy /y %%I "%INSTALLROOT%" > nul
-  )
-
-  goto clean-int
-
-:perl
-
-  set PATHCOPY=%PATH%
-
-:perl-loop
-
-  if defined PERLEXE goto :EOF
-
-  rem This code is used to find out if Perl is available in the path
-
-  for /f "delims=; tokens=1,2*" %%I in ("%PATHCOPY%") do (
-    if exist %%I\perl.exe set PERLEXE=perl
-    set PATHCOPY=%%J;%%K
-  )
-
-  if defined PERLEXE goto :EOF
-
-  rem No Perl found in the path, so try some standard locations
-
-  if not "%PATHCOPY%" == ";" goto perl-loop
-
-  if exist %SYSTEMROOT%\Perl\bin\perl.exe set PERLEXE=%SYSTEMROOT%\Perl\bin\perl
-  if exist %ProgramFiles%\Perl\bin\perl.exe set PERLEXE=%ProgramFiles%\Perl\bin\perl
-  if exist %SYSTEMROOT%\strawberry\Perl\bin\perl.exe set PERLEXE=%SYSTEMROOT%\strawberry\Perl\bin\perl
-
-  if defined PERLEXE goto :EOF
-
-  rem Failed to find Perl, give up and kill the entire batch process
-
-  echo.
-  echo  This procedure requires Perl, but it could not be found.
-
-  exit /b 1
-
-  goto :EOF
-
-:savetlg
-
-  call :perl
-
-  if [%2] == [] goto help
-  if not exist %CHECKDIR%\%2.lvt (
-    echo.
-    echo Check file %2.lvt not found!
-    shift
-    goto end
-  )
-
-  for %%I in (%CHECKUNPACK%) do (
-    tex %%I > nul
-  )
-
-  copy /y %SCRIPTDIR%\log2tlg            > nul
-  copy /y %SCRIPTDIR%\regression-test.tex > nul
-  copy /y %CHECKDIR%\%2.lvt              > nul
-
-  echo.
-  echo Creating and copying %2.tlg
-
-  for /l %%I in (1,1,%CHECKRUNS%) do (
-      %CHECKEXE% %2.lvt > nul
-    )
-  %PERLEXE% log2tlg %2 < %2.log > %2.tlg
-  copy /y %2.tlg %CHECKDIR%\%2.tlg > nul
-
-  shift
-
-  goto clean-int
-
-:unpack
-
-  for %%I in (%UNPACK%) do (
-    tex %%I %REDIRECT%
-  )
-
-  goto end
-
-:end
-
-  rem If something like "make check show" was used, remove the "show"
-
-  if /i [%2] == [show] shift
-
-  shift
-  if not [%1] == [] goto main
\ No newline at end of file
diff --git a/xpackages/xtheorem/Makefile b/xpackages/xtheorem/Makefile
deleted file mode 100644
index 8cf61c6..0000000
--- a/xpackages/xtheorem/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-all:	xbase getl3 unpack
-
-xbase:
-	(cd ../xbase; latex xbase.ins)
-	mv ../xbase/*.sty .
-
-getl3:
-	(cd ../../l3in2e ; latex l3.ins )
-	mv ../../l3in2e/*.sty .
-
-unpack:
-	latex xtheorem.ins
-
-clean:
-	rm -f *.sty *.dvi *.aux *.log *.toc *~
-	rm -f l3in2e.err
-
-test:
-	latex xtheorem-test
-
-check: xbase getl3 unpack test clean
diff --git a/xpackages/xtheorem/make.bat b/xpackages/xtheorem/make.bat
deleted file mode 100644
index 6918147..0000000
--- a/xpackages/xtheorem/make.bat
+++ /dev/null
@@ -1,135 +0,0 @@
- at echo off
-
-setlocal
-
-set AUXFILES=aux dvi log toc
-set CLEAN=pdf sty
-set EXPL3DIR=..\..\l3in2e
-set NEXT=end
-set TEST=xtheorem-test
-set XBASEDIR=..\xbase
-
-:loop
-
-  if /i "%1" == "all"    goto :all
-  if /i "%1" == "check"  goto :check
-  if /i "%1" == "clean"  goto :clean
-  if /i "%1" == "doc"    goto :doc
-  if /i "%1" == "test"   goto :test
-  if /i "%1" == "unpack" goto :unpack
-
-  goto :help
-  
-:all
-
-  set NEXT=end
-
-:all-int 
- 
-  pushd %EXPL3DIR%
-  tex l3.ins >temp.log
-  popd
-  copy /y %EXPL3DIR%\*.sty > temp.log
-  pushd %EXPL3DIR%
-  del /q *.sty *.log
-  popd
-  
-  pushd %XBASEDIR%
-  tex xbase.ins >temp.log
-  popd
-  copy /y %XBASEDIR%\*.sty > temp.log
-  pushd %XBASEDIR%
-  del /q *.sty *.log
-  popd
-
-  goto :unpack-int
-
-:check
-
-  set NEXT=check-return
-  goto :all-int
-  
-:check-return
-
-  set NEXT=clean
-  goto :test-int
-
-:clean
-
-  for %%I in (%CLEAN%) do if exist *.%%I del /q *.%%I
-
-:clean-int
-
-  for %%I in (%AUXFILES%) do if exist *.%%I del /q *.%%I
-  
-  if exist l3in2e.err del l3in2e.err
-  
-  goto :end
-  
-:doc
-
-    for %%I in (*.dtx) do (
-    echo   %%I
-    pdflatex -interaction=nonstopmode %%I > temp.log
-    if ERRORLEVEL 0 (
-      pdflatex -interaction=nonstopmode %%I > temp.log
-    )
-  )
-
-  goto :clean-int  
-  
-:help
-
-  echo.
-  echo. make all                - extract modules plus expl3
-  echo  make clean              - clean out directory
-  echo  make check              - set up and run all test files
-  echo  make doc                - typeset all dtx files
-  echo  make test               - run all test files
-  echo  make unpack             - extract modules
-  echo.
-  echo  make help               - show this help text
-  echo  make
-  
-  goto :end
-  
-:test
-
-  set NEXT=clean-int
-
-:test-int
-
-  for %%I in (%TEST%) do (
-    echo   %%I
-    pdflatex -interaction=batchmode %%I > temp.log
-    if not ERRORLEVEL 0 (
-      echo.
-      echo **********************
-      echo * Compilation failed *
-      echo **********************
-      echo.
-    )
-  )
-
-  goto :%NEXT%  
-
-:unpack  
-
-  set NEXT=end
-
-:unpack-int
-
-  for %%I in (*.ins) do (
-    tex %%I > temp.log
-  )
-  
-  del /q *.log
-
-  goto :%NEXT%
-  
-:end
-
-  shift
-  if not "%1" == "" goto :loop
-  
-  endlocal
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the latex3-commits mailing list