pst-pdf (25apr17)

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

10 files changed, 28 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
index c4a09820c8e..462062fcaa2 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
+++ b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
@@ -133,3 +133,6 @@ v1.2a
          General: Engine tests changed (RN)
 v1.2b
          General: Loading packages ‘if*’ at wrong place (RN)
+v1.2c
+         General: “postscript” environment no more allowed before
+                 \begin{document} (changed example file).
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/Makefile b/Master/texmf-dist/doc/latex/pst-pdf/Makefile
index d64415fecf0..df2a53cab71 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/Makefile
+++ b/Master/texmf-dist/doc/latex/pst-pdf/Makefile
@@ -1,5 +1,5 @@
 
-# `pst-pdf' -- Rolf Niepraschk, 2016-07-15, Rolf.Niepraschk@gmx.de
+# `pst-pdf' -- Rolf Niepraschk, 2017-03-05, Rolf.Niepraschk@gmx.de
 
 
 .SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
@@ -44,7 +44,11 @@ $(EXAMPLE:.tex=.pdf) : $(EXAMPLE) $(ADDINPUTS) $(PDF_CONTAINER) $(PACKAGE).sty
 	$(PDFLATEX) $<
 
 dist : doc doc-DE pdf example
-	tar cvzf $(ARCHNAME).tar.gz $(ARCHFILES)
+	rm -rf $(PACKAGE)
+	mkdir $(PACKAGE)
+	cp -p $(ARCHFILES) $(PACKAGE)/
+	tar cvzf $(ARCHNAME).tar.gz $(PACKAGE)
+	rm -rf $(PACKAGE)
 	@ echo
 	@ echo $(ARCHNAME).tar.gz
 
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
index b8e6f247c09..617406b07d7 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
index a5aaa7ffe8d..09f8446c944 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex
index dbcbae5ba7c..2abb6025b57 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex
@@ -8,8 +8,9 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2004-2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% Copyright (C) 2004--2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %%                            and Hubert Gaesslein
+%%               2008--      Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.2 of this license
@@ -41,11 +42,6 @@
 
 \pagestyle{empty}
 
-\begin{postscript}[trim=0 0 0 0,ignore]
-  \includegraphics[width=.475\textwidth]{penguin.eps}
-\end{postscript}
-\savepicture{ps:A}
-
 \begin{pst-pdf-defs}%
 
 %% This definition must be within the pst-pdf-defs environment!
@@ -115,19 +111,15 @@
   \rput(0,-3.8){PSTricks}
   \rput(0,3.8){\LaTeX}
   \showgrid
-\end{pspicture}\savepicture{ps:B}
+\end{pspicture}\savepicture{ps:A}
 
 \vfill\null\newpage
 
-\usepicture{ps:A}
-\hfill
 \includegraphics[width=.475\textwidth]{insect1}
 
 \vfill
 
-\usepicture[angle=180,origin=c]{ps:A}
-\hfill
-\usepicture[width=.47\textwidth]{ps:B}
+\usepicture[width=.47\textwidth]{ps:A}
 
 \includegraphics[width=.475\textwidth,frame=false,
   namefont={\Huge\itshape}]{knuth}
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
index c6dcfc1e525..1db5946b888 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
diff --git a/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex b/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex
index 153c057a86e..8d19127288d 100644
--- a/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex
+++ b/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex
@@ -1,9 +1,9 @@
 % Rolf Niepraschk,  <Rolf.Niepraschk@gmx.de>
 % Hubert Gaesslein
-% 2008-02-24
+% 2017-04-24
 \documentclass[draft]{ltxdoc}
 \usepackage[T1]{fontenc}
-\usepackage[latin9]{inputenc}
+\usepackage[utf8]{inputenc}
 \usepackage[document]{ragged2e}
 \usepackage{calc}
 
@@ -35,7 +35,7 @@
 
 \makeatother
 
-\renewcommand*\TeX{TeX} \renewcommand*\LaTeX{LaTeX}% zu sp�t! RN.
+\renewcommand*\TeX{TeX} \renewcommand*\LaTeX{LaTeX}% too late! RN.
 
 \setlength\parindent{0pt} \pagestyle{empty} \nofiles \raggedbottom
 
diff --git a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
index 634e9eea64a..b6e04367c4f 100644
--- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
+++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
@@ -1,8 +1,8 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 
-%   2005--2008: Rolf Niepraschk,  <Rolf.Niepraschk@gmx.de>, Hubert Gaesslein
-%   2008--:     Rolf Niepraschk,  <Rolf.Niepraschk@gmx.de>
+%   2005--2008: Rolf Niepraschk <Rolf.Niepraschk@gmx.de>, Hubert Gaesslein
+%   2008--      Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 % --------------------------------------------------------------
 %
 % This file may be distributed and/or modified under the
@@ -24,7 +24,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{pst-pdf}
 %<*package>
-    [2017/02/25 v1.2b PS graphics for pdfLaTeX (RN,HjG)]
+    [2017/04/24 v1.2c PS graphics for pdfLaTeX (RN,HjG)]
 %</package>
 %
 %<*driver>
@@ -94,6 +94,8 @@
 % PSTricks environment ``psmatrix'' inside user definitions. (RN,HjG)}
 % \changes{v1.1m}{2006/03/10}{Merge english and german version of the
 % documentation. (RN)}
+% \changes{v1.2c}{2017/04/24}{``postscript'' environment no more allowed before 
+% \cmd{\begin}{\ttfamily\char`\{document\char`\}} (changed example file). }
 % \GetFileInfo{pst-pdf.dtx}
 %
 % \DoNotIndex{\newcommand,\renewcommand,\newenvironment,\renewenvironment}
@@ -1770,12 +1772,6 @@
 
 \pagestyle{empty}
 
-\begin{postscript}[trim=0 0 0 0,ignore]
-  \includegraphics[width=.475\textwidth]{penguin.eps}
-\end{postscript}
-\savepicture{ps:A}
-
-
 \begin{pst-pdf-defs}%
 
 %% This definition must be within the pst-pdf-defs environment!
@@ -1846,19 +1842,15 @@
   \rput(0,-3.8){PSTricks}
   \rput(0,3.8){\LaTeX}
   \showgrid
-\end{pspicture}\savepicture{ps:B}
+\end{pspicture}\savepicture{ps:A}
 
 \vfill\null\newpage
 
-\usepicture{ps:A}
-\hfill
 \includegraphics[width=.475\textwidth]{insect1}
 
 \vfill
 
-\usepicture[angle=180,origin=c]{ps:A}
-\hfill
-\usepicture[width=.47\textwidth]{ps:B}
+\usepicture[width=.47\textwidth]{ps:A}
 
 \includegraphics[width=.475\textwidth,frame=false,
   namefont={\Huge\itshape}]{knuth}
diff --git a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins
index 85468249513..f842aa90ab0 100644
--- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins
+++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins
@@ -8,8 +8,9 @@
 
 This is a generated file.
 
-Copyright (C) 2004-2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+Copyright (C) 2004--2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
                            and Hubert Gaesslein
+              2008--      Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 
 This file may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.2 of this license
diff --git a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
index 9cd5b818646..b892f7ffd8e 100644
--- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
@@ -8,8 +8,9 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2004-2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% Copyright (C) 2004--2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %%                            and Hubert Gaesslein
+%%               2008--      Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.2 of this license
@@ -23,7 +24,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pst-pdf}
-    [2017/02/25 v1.2b PS graphics for pdfLaTeX (RN,HjG)]
+    [2017/04/24 v1.2c PS graphics for pdfLaTeX (RN,HjG)]
 \newcommand*\ppf@TeX@mode{-1}
 \newcommand*\ppf@draft{false}
 \newif\if@ppf@PST@used\@ppf@PST@usedtrue