From ba3365290fc0393217f38c55350c73e34d36a20e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Mar 2017 21:39:19 +0000 Subject: pst-pdf (5mar17) git-svn-id: svn://tug.org/texlive/trunk@43406 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pst-pdf/CHANGES | 2 ++ Master/texmf-dist/doc/latex/pst-pdf/Makefile | 31 +++++++++++---------- Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf | Bin 507262 -> 507689 bytes .../doc/latex/pst-pdf/pst-pdf-example.pdf | Bin 452296 -> 452628 bytes Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf | Bin 516364 -> 516759 bytes Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex | 2 +- Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx | 5 ++-- Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty | 4 +-- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES index b6f36d7b494..c4a09820c8e 100644 --- a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES +++ b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES @@ -131,3 +131,5 @@ v1.1v General: Local redefinition of \pdfoutput to be a counter. (RN) v1.2a General: Engine tests changed (RN) +v1.2b + General: Loading packages ‘if*’ at wrong place (RN) diff --git a/Master/texmf-dist/doc/latex/pst-pdf/Makefile b/Master/texmf-dist/doc/latex/pst-pdf/Makefile index 1e72ef57e3d..d64415fecf0 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, 2008-02-24, Rolf.Niepraschk@ptb.de +# `pst-pdf' -- Rolf Niepraschk, 2016-07-15, Rolf.Niepraschk@gmx.de .SUFFIXES : .tex .ltx .dvi .ps .pdf .eps @@ -13,7 +13,7 @@ LATEX = latex ARCHNAME = $(PACKAGE)-$(shell date +"%Y%m%d") ARCHNAME_TDS = $(PACKAGE).tds -EXAMPLE = $(PACKAGE)-example.tex +EXAMPLE = $(PACKAGE)-example.tex ADDINPUTS = penguin.eps elephant.ps knuth.png psf-demo.eps \ insect1.eps insect15.eps @@ -42,13 +42,13 @@ example : $(EXAMPLE:.tex=.pdf) $(EXAMPLE:.tex=.pdf) : $(EXAMPLE) $(ADDINPUTS) $(PDF_CONTAINER) $(PACKAGE).sty $(PDFLATEX) $< - + dist : doc doc-DE pdf example tar cvzf $(ARCHNAME).tar.gz $(ARCHFILES) @ echo @ echo $(ARCHNAME).tar.gz -%.gls %.pdf : %.dtx $(PACKAGE).sty +%.gls %.pdf : %.dtx $(PACKAGE).sty test -f $(basename $<).glo || touch -f $(basename $<).glo test -f $(basename $<).idx || touch -f $(basename $<).idx makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ @@ -57,7 +57,7 @@ dist : doc doc-DE pdf example $(basename $<).idx $(PDFLATEX) $< -$(PACKAGE)-DE.gls $(PACKAGE)-DE.pdf : $(PACKAGE).dtx $(PACKAGE).sty +$(PACKAGE)-DE.gls $(PACKAGE)-DE.pdf : $(PACKAGE).dtx $(PACKAGE).sty test -f $(basename $@).glo || touch -f $(basename $@).glo test -f $(basename $@).idx || touch -f $(basename $@).idx makeindex -s gglo.ist -t $(basename $@).glg -o $(basename $@).gls \ @@ -67,8 +67,8 @@ $(PACKAGE)-DE.gls $(PACKAGE)-DE.pdf : $(PACKAGE).dtx $(PACKAGE).sty cp $< $(basename $@).dtx $(PDFLATEX) '\newcommand*{\mainlang}{ngerman}\input{$(basename $@).dtx}' $(RM) $(basename $@).dtx - -%.pdf : %.tex + +%.pdf : %.tex $(PDFLATEX) $< $(PACKAGE).sty $(EXAMPLE) : $(PACKAGE).ins $(PACKAGE).dtx @@ -88,16 +88,19 @@ $(PDF_CONTAINER) : $(PDF_CONTAINER:.pdf=.ps) $(PS2PDF) $< $@; \ fi -CHANGES : CHANGES.pdf +CHANGES : CHANGES.pdf pdftotext -enc UTF-8 -layout -nopgbrk $< $@ - + CHANGES.pdf : CHANGES.tex $(PACKAGE).gls $(PDFLATEX) $< - -arch : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf - zip $(ARCHNAME).zip $(ARCHFILES) -arch-tds : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf +arch : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf + mkdir $(PACKAGE) + cp -p $(ARCHFILES) $(PACKAGE)/ + zip -r $(ARCHNAME).zip $(PACKAGE)/ + rm -rf $(PACKAGE)/ + +arch-tds : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf $(RM) $(ARCHNAME_TDS).zip mkdir -p tds/tex/latex/pst-pdf mkdir -p tds/doc/latex/pst-pdf @@ -123,6 +126,6 @@ clean : CHANGES.pdf veryclean : clean - $(RM) $(PACKAGE).pdf pst-pdf-DE.pdf $(EXAMPLE:.tex=.pdf) CHANGES + $(RM) $(PACKAGE).pdf pst-pdf-DE.pdf $(EXAMPLE:.tex=.pdf) CHANGES # EOF 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 beb9eafee7b..b8e6f247c09 100644 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf differ 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 0e2ce00e6a1..a5aaa7ffe8d 100644 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf differ 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 d8c341aedc2..c6dcfc1e525 100644 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf differ diff --git a/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex b/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex index 8ca7e00cb2a..153c057a86e 100644 --- a/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex +++ b/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex @@ -1,4 +1,4 @@ -% Rolf Niepraschk, +% Rolf Niepraschk, % Hubert Gaesslein % 2008-02-24 \documentclass[draft]{ltxdoc} 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 8246a03c8a4..634e9eea64a 100644 --- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx +++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx @@ -24,7 +24,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{pst-pdf} %<*package> - [2016/07/11 v1.2a PS graphics for pdfLaTeX (RN,HjG)] + [2017/02/25 v1.2b PS graphics for pdfLaTeX (RN,HjG)] % % %<*driver> @@ -638,9 +638,10 @@ % or |inactive| were not given. % \fi % \changes{v1.2a}{2016/07/11}{Engine tests changed (RN)} +% \changes{v1.2b}{2017/02/25}{Loading packages `if*' at wrong place (RN)} % \begin{macrocode} +\RequirePackage{ifpdf,ifxetex,ifvtex} \ifnum\ppf@TeX@mode=-1\relax - \RequirePackage{ifpdf,ifxetex,ifvtex}% \ifpdf % \end{macrocode} % \quad$\Rightarrow$\,pdf\TeX{} or Lua\TeX{} are running in PDF mode 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 05e3e6073c9..9cd5b818646 100644 --- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty +++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pst-pdf} - [2016/07/11 v1.2a PS graphics for pdfLaTeX (RN,HjG)] + [2017/02/25 v1.2b PS graphics for pdfLaTeX (RN,HjG)] \newcommand*\ppf@TeX@mode{-1} \newcommand*\ppf@draft{false} \newif\if@ppf@PST@used\@ppf@PST@usedtrue @@ -44,8 +44,8 @@ \PassOptionsToPackage\CurrentOption{pstricks}} \ProcessOptions\relax \ifnum\ppf@TeX@mode=999\relax\expandafter\endinput\fi +\RequirePackage{ifpdf,ifxetex,ifvtex} \ifnum\ppf@TeX@mode=-1\relax - \RequirePackage{ifpdf,ifxetex,ifvtex}% \ifpdf \def\ppf@TeX@mode{1}% \RequirePackage{luatex85}% -- cgit v1.2.3