pictex (10jun21)

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

7 files changed, 42 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/generic/pictex/00index b/Master/texmf-dist/doc/generic/pictex/00index
deleted file mode 100644
index 81b80d1a414..00000000000
--- a/Master/texmf-dist/doc/generic/pictex/00index
+++ /dev/null
@@ -1,16 +0,0 @@
-PICTEX.STY

-	Style zum Einladen von PiCTeX als LaTeX-option oder LaTeX-Package.

-	Incl. Einladen von PICCORR.STY und PICMORE.STY, falls vorhanden.

-	

-PICCORR.STY

-	Korrektur zu PiCTeXs \betweenarrows-Befehl

-	

-PICMORE.STY

-	Erweiterung zu PiCTeX f"ur Impulsdiagramme

-	

-PICTEXWD.TEX

-	Gepatchtes PICTEX.TEX, das weniger Dimensionsregister benutzt.

-	Fehlermeldungen an Andreas.Schrell@RS.maus.de

-	

-PICTEXWD.STY

-	Wie PICTEX.STY, aber es wird PICTEXWD.TEX eingeladen.

diff --git a/Master/texmf-dist/doc/generic/pictex/README b/Master/texmf-dist/doc/generic/pictex/README
deleted file mode 100644
index 63ba8eaa022..00000000000
--- a/Master/texmf-dist/doc/generic/pictex/README
+++ /dev/null
@@ -1,11 +0,0 @@
-The PiCTeX macro package is released under the LaTeX Project Public
-License, version 1 or (at your option) any later version.
-
-
-NOTE.   There is a detailed manual for PiCTeX available from
-	Michael Wichura
-	Department of Statistics 
-	University of Chicago.
-
-	(312) 702-8329
-	Wichura@Galton.Uchicago.EDU
diff --git a/Master/texmf-dist/doc/generic/pictex/README.TEXLIVE b/Master/texmf-dist/doc/generic/pictex/README.TEXLIVE
new file mode 100644
index 00000000000..4f6cc14e8b3
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pictex/README.TEXLIVE
@@ -0,0 +1,9 @@
+The files below have been removed in the TeX Live installation of
+the current package, possibly because of missing source (e.g., a
+PDF with no source), possibly because their only purpose is to support
+nonfree fonts or other software, possibly for other reasons.
+More info: https://tug.org/texlive/pkgcontrib.html#requirements
+
+If this is a concern, please contact the package maintainer.
+
+	PiCTeX_manual.pdf
diff --git a/Master/texmf-dist/doc/generic/pictex/README.txt b/Master/texmf-dist/doc/generic/pictex/README.txt
new file mode 100644
index 00000000000..64d3c6f34b5
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pictex/README.txt
@@ -0,0 +1,9 @@
+The PiCTeX macro package is released under the LaTeX Project Public
+License, version 1 or (at your option) any later version.
+
+Version 1.1  1987-10-09
+Version 1.1b 2021-06-08 (updated LaTeX support)
+
+
+NOTE.   There is a detailed manual for PiCTeX available from CTAN;
+        see PiCTeX_manual.pdf
diff --git a/Master/texmf-dist/tex/generic/pictex/postpictex.tex b/Master/texmf-dist/tex/generic/pictex/postpictex.tex
index d46612a862d..b70bc1cdafe 100644
--- a/Master/texmf-dist/tex/generic/pictex/postpictex.tex
+++ b/Master/texmf-dist/tex/generic/pictex/postpictex.tex
@@ -1,4 +1,9 @@
-% This is postpictex.tex  Version 1.1  9/10/87
+% This is postpictex.tex
+%    Version 1.1 9/10/87.
+%            See section 10 of the PiCTeX manual.
+%    Version 1.1b 2021-06-08 extended LaTeX support for picture environment
+%            LaTeX Project (with Michael Wichura's permission for the update)
+%            add \put and \multiput to the list of commands restored for LaTeX.
 
 % To use the PiCTeX macros under LaTeX, you first need to \input the
 % file prepictex.tex, then the main corpus of PiCTeX macros (pictex.tex), 
@@ -39,6 +44,13 @@
 \let\linethickness=\!latexlinethickness
 \let\pictexlinethickness=\!pictexlinethickness
 
+% 2021-06-08 and same for \put and \multiput
+\let\put=\!latexput
+\let\pictexput=\!pictexput
+\let\multiput=\!latexmultiput
+\let\pictexmultiput=\!pictexmultiput
+
+
 % Reset LaTeX's default meaning of \\
 \let\\=\@normalcr
 \catcode`@=12 \catcode`!=12
diff --git a/Master/texmf-dist/tex/generic/pictex/prepictex.tex b/Master/texmf-dist/tex/generic/pictex/prepictex.tex
index cd7f92e2fe0..a0e825066fd 100644
--- a/Master/texmf-dist/tex/generic/pictex/prepictex.tex
+++ b/Master/texmf-dist/tex/generic/pictex/prepictex.tex
@@ -1,4 +1,8 @@
-% This is prepictex.tex  Version 1.1  9/10/87
+% This is prepictex.tex
+%    Version 1.1 9/10/87. See section 10 of the PiCTeX manual.
+%    Version 1.1b 2021-06-08 extended LaTeX support for picture environment
+%            LaTeX Project (with Michael Wichura's permission for the update)
+%            Support lengths in LaTeX picture mode coordinates in recent LaTeX.
 
 % To use the PiCTeX macros under LaTeX, you first need to \input this
 % file, then the main corpus of PiCTeX macros (pictex.tex), and then
@@ -20,14 +24,16 @@
 \let\!latexput=\put
  
 % Redefine the LaTeX \@picture macro
+% 2021-06-08 Adjust so working for old and new LaTeX releases
+\let\!latex@picture\@picture
 \def\@picture(#1,#2)(#3,#4){%
-  \@picht #2\unitlength
-  \setbox\@picbox\hbox to #1\unitlength\bgroup 
+  \!latex@picture(#1,#2)(#3,#4)%
   \let\endpicture=\!latexendpicture
   \let\frame=\!latexframe
   \let\linethickness=\!latexlinethickness
   \let\multiput=\!latexmultiput
   \let\put=\!latexput
-  \hskip -#3\unitlength \lower #4\unitlength \hbox\bgroup}
+  \ignorespaces}
+
 
 \catcode`@=12 \catcode`!=12
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index fa0c09da300..d9ff1c0e8bd 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3603,6 +3603,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'padauk'	 => '\.pdf$',				# no source
  'pas-cours'     => '\.pdf$',                           # no source
  'pas-tableur'   => '\.pdf$',                           # no source
+ 'pictex'	 => 'manual.pdf$',			# no source
  'piechartmp'    => 'piechartmp.pdf',                   # no source
  'ptptex'        => '(overcite|cite|wrapfig).sty',      # duplicated
  'sapthesis'     => '.*-ML.*\.pdf',                     # univ logos