2 files changed, 135 insertions, 111 deletions
diff --git a/Master/texmf-dist/tex/latex/carlisle/ltxtable.sty b/Master/texmf-dist/tex/latex/carlisle/ltxtable.sty
new file mode 100644
index 00000000000..d6e5ffb9d3a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/carlisle/ltxtable.sty
@@ -0,0 +1,135 @@
+%% LaTeX2e file `ltxtable.sty'
+%% generated by the `filecontents' environment
+%% from source `ltxtable' on 2006/06/21.
+%%
+%
+%% ltxtable package (C) 1995 David Carlisle
+%%
+%% This file may be distributed under the terms of the LPPL.
+%% See 00readme.txt for details.
+%
+% User documentation is in the file ltxtable.tex
+%
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{ltxtable}
+                [1995/12/11 v0.2 longtable/tabularx merge (DPC)]
+%    \end{macrocode}
+%
+% May as get these in, going to need them...
+%    \begin{macrocode}
+\RequirePackage{tabularx,longtable}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\LTXtable#1#2{%
+\begingroup
+\TX@target#1\relax
+\expandafter\TX@newcol\expandafter{\tabularxcolumn{\TX@col@width}}%
+  \def\@elt##1{\global\value{##1}\the\value{##1}\relax}%
+  \edef\TX@ckpt{\cl@@ckpt}%
+  \let\@elt\relax
+  \TX@old@table=\maxdimen
+  \TX@col@width=\TX@target
+  \global\TX@cols=\@ne
+  \TX@typeout@
+    {\@spaces Table Width\@spaces Column Width\@spaces X Columns}%
+%    \end{macrocode}
+% Need to modify |\TX@trial| so that |longtable| functions are
+% Subverted to do the measuring that |tabularx| normally does.
+% Also during the trial runs each `chunk' is not unboxed so it just
+% gets thrown away when the next chunk starts.
+%    \begin{macrocode}
+\def\TX@trial##1{%
+  \setbox\@tempboxa=\hbox{%
+%    \end{macrocode}
+% |\multicolum| A sad tale, For now just stop |longtable| messing with
+% it, so that |tabularx| can mess with it.
+%    \begin{macrocode}
+\let\LTmulticolumn\multicolumn
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\endlongtable{%
+  \LT@echunk
+\global\setbox\@ne\hbox{\unhbox\@ne}%
+  \kern\wd\@ne
+  \LT@get@widths%
+  \endgroup}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\LT@ntabularcr{%
+  \ifnum0=`{}\fi
+  \LT@echunk
+  \LT@get@widths
+  \LT@bchunk}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\LT@argtabularcr[####1]{%
+  \ifnum0=`{}\fi
+  \ifdim ####1>\z@
+  \unskip\@xargarraycr{####1}\else \@yargarraycr{####1}\fi
+  \LT@echunk
+  \LT@get@widths
+  \LT@bchunk}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+% Any extra commands. This is used on the first run to count the number
+% of {\ttfamily X} columns.
+%    \begin{macrocode}
+    ##1\relax
+%    \end{macrocode}
+% Added at v1.05: dissable "\write"s during a trial run. This trick is
+% from the \TeX{}Book.
+%    \begin{macrocode}
+   \let\immediate=\relax\def\write####1####{{\afterassignment}\toks@=}%
+%    \end{macrocode}
+% Turn off warnings (see appendix D). Also prevent them being turned
+% back on by setting the parameter names to be registers.
+%    \begin{macrocode}
+    \hbadness=\@M\hfuzz=\maxdimen
+    \let\hbadness=\@tempcnta\let\hfuzz=\@tempdima
+%    \end{macrocode}
+% Make the table, and finish the hbox.
+% Since v1.06, "\toks@" contains the preamble specification,
+% and possible optional argument, as well as the table body.
+% Well it does in |tabularx|, here the body is in an external file so
+% just input it.
+%    \begin{macrocode}
+    \input{#2}\unskip}%
+%    \end{macrocode}
+% Since v1.05 reset all \LaTeX\ counters, by executing "\TX@ckpt".
+%    \begin{macrocode}
+\TX@ckpt
+%    \end{macrocode}
+% Print some statistics.
+% Added "\TX@align" in v1.05, to line up the columns.
+%    \begin{macrocode}
+  \TX@typeout@{\@spaces
+     \expandafter\TX@align
+        \the\wd\@tempboxa\space\space\space\space\space\@@
+     \expandafter\TX@align
+        \the\TX@col@width\space\space\space\space\space\@@
+     \@spaces\the\TX@cols}}%
+%    \end{macrocode}
+% \end{macro}
+  \TX@trial{\def\NC@rewrite@X{%
+          \global\advance\TX@cols\@ne\NC@find p{\TX@col@width}}}%
+\let\LT@make@row\LT@blank@row
+  \loop
+    \TX@arith
+    \ifTX@
+    \TX@trial{}%
+  \repeat
+%    \end{macrocode}
+% On the last run, may as well run with |\setlongtables|.
+%    \begin{macrocode}
+\let\LT@make@row\relax
+\input{#2}%
+\endgroup}
+%    \end{macrocode}
+
+
diff --git a/Master/texmf-dist/tex/latex/carlisle/pspicture.sty b/Master/texmf-dist/tex/latex/carlisle/pspicture.sty
deleted file mode 100644
index 5b7659798ce..00000000000
--- a/Master/texmf-dist/tex/latex/carlisle/pspicture.sty
+++ /dev/null
@@ -1,111 +0,0 @@
-%%
-%% This is file `pspicture.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% pspicture.dtx  (with options: `package,dvips')
-%% 
-%%
-%% Source File `pspicture.dtx'.
-%% Copyright (C) 1992 1999 David Carlisle
-%% This file may be distributed under the terms of the LPPL.
-%% See 00readme.txt for details.
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pspicture}
-          [1999/04/11/ v2.02 Picture mode via PS specials (DPC)]
-
-       \def\PS@header#1{\special{header=#1}}
-\PS@header{pspicture.ps}
-       \def\PS@special#1{\special{"#1}}
-{\catcode`t=12\catcode`p=12\gdef\noPT#1pt{#1}}
-\def\strippt#1{\expandafter\noPT\the#1\space}
-\def\@circle#1{%
-  \@tempdimb #1\unitlength
-  \PS@special{%
-       \strippt\@wholewidth
-       \strippt\@tempdimb
-       !C}}
-\def\@dot#1{%
-  \@tempdimb #1\unitlength
-  \PS@special{%
-       \strippt\@tempdimb
-       !D}}
-\def\line(#1,#2)#3{%
-  \@linelen=#3\unitlength
-  \PS@special{%
-       \strippt\@wholewidth
-       #1
-       #2
-       \strippt\@linelen
-       !L}}
-\def\vector(#1,#2)#3{%
-  \@linelen=#3\unitlength
-  \PS@special{%
-       \strippt\@arrowlength
-       \strippt\@wholewidth
-       #1
-       #2
-       \strippt\@linelen
-       !V}}
-\def\oval{%
-  \@ifnextchar[%
-   {\@ov@l}%
-   {\count@=\maxdimen \divide\count@ by \unitlength \@ov@l[\count@]}}
-\def\@ov@l[#1](#2,#3){%
-  \@ifnextchar[{\@oval[#1](#2,#3)}{\@oval[#1](#2,#3)[]}}%
-\def\@oval[#1](#2,#3)[#4]{\begingroup
-  \@tempdimb #1\unitlength
-  \@ovxx #2\unitlength
-  \@ovyy #3\unitlength
-  \def\r{\def\TL{0 }\def\BL{0 }}%
-  \def\l{\def\TR{0 }\def\BR{0 }}%
-  \def\t{\def\BL{0 }\def\BR{0 }}%
-  \def\b{\def\TL{0 }\def\TR{0 }}%
-  \def\TL{1 }\def\BL{1 }\def\TR{1 }\def\BR{1 }%
-  \@tfor\@tempa :=#4\do{\csname\@tempa\endcsname}%
-  \PS@special{%
-       \BR\BL\TR\TL
-       \strippt\@wholewidth
-       \strippt\@tempdimb
-       \strippt\@ovxx
-       \strippt\@ovyy
-       !O}%
-  \endgroup}
-\def\Line(#1,#2){%
-  \@ovxx #1\unitlength
-  \@ovyy #2\unitlength
-  \PS@special{%
-       \strippt\@wholewidth
-       \strippt\@ovxx
-       \strippt\@ovyy
-       !L2}}
-\def\Curve(#1,#2)#3{%
-  \@ovxx #1\unitlength
-  \@ovyy #2\unitlength
-  \PS@special{%
-       \strippt\@wholewidth
-       \strippt\@ovxx
-       \strippt\@ovyy
-       #3
-       !C2}}
-\def\Vector(#1,#2){%
-  \@ovxx #1\unitlength
-  \@ovyy #2\unitlength
-  \PS@special{%
-       \strippt\@arrowlength
-       \strippt\@wholewidth
-       \strippt\@ovxx
-       \strippt\@ovyy
-       !V2}}
-\newdimen\@arrowlength
-\def\arrowlength#1{\@arrowlength #1}
-\arrowlength{8pt}
-     \endinput
-
-
-
-\endinput
-%%
-%% End of file `pspicture.sty'.