texlive[52819] trunk: pst-pdf (16nov19)
commits+karl at tug.org
commits+karl at tug.org
Sat Nov 16 23:14:52 CET 2019
Revision: 52819
http://tug.org/svn/texlive?view=revision&revision=52819
Author: karl
Date: 2019-11-16 23:14:52 +0100 (Sat, 16 Nov 2019)
Log Message:
-----------
pst-pdf (16nov19)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/oberdiek/pdfatfi.pl
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
trunk/Master/texmf-dist/doc/latex/pst-pdf/Makefile
trunk/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
trunk/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
trunk/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
trunk/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
trunk/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex
Modified: trunk/Build/source/texk/texlive/linked_scripts/oberdiek/pdfatfi.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/oberdiek/pdfatfi.pl 2019-11-16 17:19:00 UTC (rev 52818)
+++ trunk/Build/source/texk/texlive/linked_scripts/oberdiek/pdfatfi.pl 2019-11-16 22:14:52 UTC (rev 52819)
@@ -10,15 +10,18 @@
# conditions of the LaTeX Project Public License, either
# version 1.3c of this license or (at your option) any later
# version. This version of this license is in
-# http://www.latex-project.org/lppl/lppl-1-3c.txt
+# https://www.latex-project.org/lppl/lppl-1-3c.txt
# and the latest version of this license is in
-# http://www.latex-project.org/lppl.txt
+# https://www.latex-project.org/lppl.txt
# and version 1.3 or later is part of all distributions of
# LaTeX version 2005/12/01 or later.
#
# This work has the LPPL maintenance status "maintained".
#
-# This Current Maintainer of this work is Heiko Oberdiek.
+# The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
#
# See file "attachfile2.pdf" for a list of files that belong to
# this project.
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-11-16 17:19:00 UTC (rev 52818)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-11-16 22:14:52 UTC (rev 52819)
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 52752 2019-11-12 21:34:13Z karl $
+# $Id: tlmgr.pl 52799 2019-11-15 18:38:19Z karl $
#
# Copyright 2008-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 52752 $';
-my $datrev = '$Date: 2019-11-12 22:34:13 +0100 (Tue, 12 Nov 2019) $';
+my $svnrev = '$Revision: 52799 $';
+my $datrev = '$Date: 2019-11-15 19:38:19 +0100 (Fri, 15 Nov 2019) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -5676,9 +5676,9 @@
my $engine = $r{"engine"};
my $name = $r{"name"};
my $mode = $r{"mode"};
- # just never mind about these.
- next if ($name eq "cont-en");
- next if ($name eq "lualatex-dev");
+ ddebug("check_executes: fmtline name=$name engine=$engine"
+ . " mode=$mode opt=$opt\n");
+ next if ($name eq "cont-en"); # too confusing
# we check that the name exist in bin/$arch
if (",$TeXLive::TLConfig::PartialEngineSupport," =~ /,$engine,/) {
# luajittex is special since it is not available on all architectures
@@ -5688,9 +5688,21 @@
# We do not want to have error messages here, so we do the following:
# * if tlpkg/tlpsrc/luatex.tlpsrc is available, then load it
# and filter away those archs that are excluded with f/!...
- # * if tlpkg/tlpsrc/luatex.tlpsrc is *not* available (user installation)
- # we just ignore it completely.
- my $tlpsrc_file = $localtlpdb->root . "/tlpkg/tlpsrc/luatex.tlpsrc";
+ # * similarly for the other partial-support engines; too much
+ # trouble to reverse-map to package names, so just hardwire;
+ # * if tlpkg/tlpsrc/<engine>.tlpsrc is *not* available (i.e., not
+ # the development tree) we just ignore it completely.
+ my $pkg;
+ if ($engine eq "luajittex") {
+ $pkg = "luatex";
+ } elsif ($engine eq "luahbtex") {
+ $pkg = "latex-bin-dev";
+ } elsif ($engine eq "mfluajit") {
+ $pkg = "mflua";
+ } else {
+ die "unknown partial engine $engine, goodbye"; # should not happen
+ }
+ my $tlpsrc_file = $localtlpdb->root . "/tlpkg/tlpsrc/$pkg.tlpsrc";
if (-r $tlpsrc_file) {
ddebug("check_executes: found $tlpsrc_file\n");
require TeXLive::TLPSRC;
@@ -5697,7 +5709,7 @@
my $tlpsrc = new TeXLive::TLPSRC;
$tlpsrc->from_file($tlpsrc_file);
my @binpats = $tlpsrc->binpatterns;
- my @negarchs;
+ my @negarchs = ();
for my $p (@binpats) {
if ($p =~ m%^(\w+)/(!?[-_a-z0-9,]+)\s+(.*)$%) {
my $pt = $1;
@@ -5725,10 +5737,22 @@
for my $a (@archs_to_check) {
my $f = "$Master/bin/$a/$name";
if (!check_file($a, $f)) {
- push @{$missingbins{$_}}, "bin/$a/$name" if $mode;
+ push @{$missingbins{$_}}, "bin/$a/${name}[engine=$engine]" if $mode;
+# # unfortunately there are too many exceptions to this check:
+# # cygwin symlinks pointing to .exe names, pdcsplain extras, mptopdf,
+# # *latex-dev pointing to *latex instead of the binary. Instead of
+# # writing all those error-prone tests, just give up.
+# } elsif (-l $f) {
+# my $linktarget = readlink($f);
+# #ddebug("check_executes: linktarget $linktarget, $name->$engine\n");
+# if ($linktarget ne $engine) {
+# print "\t bin/$a/$name: symlink to $linktarget, not $engine\n";
+# }
+# } else {
+# ; #ddebug("check_executes: $f readable file, not a link\n");
}
if (!check_file($a, "$Master/bin/$a/$engine")) {
- push @{$missingengines{$_}}, "bin/$a/$engine" if $mode;
+ push @{$missingengines{$_}}, "bin/$a/${engine}[fmt=$name]" if $mode;
}
}
# check for the existence of the .ini file
@@ -5748,19 +5772,19 @@
}
if (keys %missinginis) {
print "\f mentioned ini files that cannot be found:\n";
- for my $i (keys %missinginis) {
+ for my $i (sort keys %missinginis) {
print "\t $missinginis{$i} (execute: $i)\n";
}
}
if (keys %missingengines) {
print "\f mentioned engine files that cannot be found:\n";
- for my $i (keys %missingengines) {
+ for my $i (sort keys %missingengines) {
print "\t @{$missingengines{$i}}\n";
}
}
if (keys %missingbins) {
print "\f mentioned bin files that cannot be found:\n";
- for my $i (keys %missingbins) {
+ for my $i (sort keys %missingbins) {
print "\t @{$missingbins{$i}}\n";
}
}
@@ -9052,7 +9076,7 @@
tlmgr remove --force foobar
Again, since packages are sometimes renamed or replaced, using this
-option is not ecommended.
+option is not recommended.
=item B<--reinstall-forcibly-removed>
@@ -9928,7 +9952,7 @@
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 52752 2019-11-12 21:34:13Z karl $
+$Id: tlmgr.pl 52799 2019-11-15 18:38:19Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
Modified: trunk/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pst-pdf/CHANGES 2019-11-16 17:19:00 UTC (rev 52818)
+++ trunk/Master/texmf-dist/doc/latex/pst-pdf/CHANGES 2019-11-16 22:14:52 UTC (rev 52819)
@@ -1,143 +1,150 @@
Changes to pst-pdf:
v1.0a
- General: Initial version.
+ General: Initial version.
v1.0b
- General: Some code and documentation cleaning. (RN)
+ General: Some code and documentation cleaning. (RN)
v1.0c
- General: New options “pstricks”, “nopstricks”, “draft” and
- “final”. (RN)
+ General: New options “pstricks”, “nopstricks”, “draft” and
+ “final”. (RN)
v1.0d
- General: Redefinition of \includegraphics in modes 0 und 1. Now
- using of eps graphics directly in pdfLaTeX is possible.
- (RN)
+ General: Redefinition of \includegraphics in modes 0 und 1. Now
+ using of eps graphics directly in pdfLaTeX is possible.
+ (RN)
v1.0e
- postscript: “trim” option added. (RN)
+ postscript: “trim” option added. (RN)
v1.0f
- \savepicture: New macro \savepspicture. (RN)
- \usepicture: New macro \usepspicture. Useful for putting a
- PSTricks graphic in a box or something else. (RN)
- General: Config file loading added. (RN)
+ \savepicture: New macro \savepspicture. (RN)
+ \usepicture: New macro \usepspicture. Useful for putting a
+ PSTricks graphic in a box or something else. (RN)
+ General: Config file loading added. (RN)
v1.0g
- \usepicture: Now \usepspicture does accept a numerical
- parameter. (RN)
- General: Definition of \PDFcontainer now with \edef. (RN)
+ \usepicture: Now \usepspicture does accept a numerical
+ parameter. (RN)
+ General: Definition of \PDFcontainer now with \edef. (RN)
v1.0h
- psmatrix: Based no more on the comment environment from the
- verbatim package. (RN)
+ psmatrix: Based no more on the comment environment from the
+ verbatim package. (RN)
v1.0i
- \ppf at is@pdfTeX at graphic: No more errors for given files without
- extensions. (RN)
+ \ppf at is@pdfTeX at graphic: No more errors for given files without
+ extensions. (RN)
v1.0j
- General: Check AtBeginDocument for package ‘pstricks’ even if
- “nopstricks” is given. (RN)
+ General: Check AtBeginDocument for package ‘pstricks’ even if
+ “nopstricks” is given. (RN)
+ For \includegraphics \usepicture and postscript the new
+ options “frame”, “framesep”, “framerule”, “linewidth”,
+ and “ignore” added. (RN)
v1.0k
- \Gin at setfile: Show also the pagenumber if exists. (RN)
- \Ginclude at graphics: Prevent division by zero. (RN)
+ \Gin at setfile: Show also the pagenumber if exists. (RN)
+ \Ginclude at graphics: Prevent division by zero. (RN)
v1.0l
- General: Options “framesep”, “framerule”, “linewidth” removed,
- “fname” and “innerframe” added. (RN)
+ General: Options “framesep”, “framerule”, “linewidth” removed,
+ “fname” and “innerframe” added. (RN)
v1.0m
- General: New package option “notightpage” added. (RN)
+ General: New package option “notightpage” added. (RN)
v1.0n
- General: Changed marcro names (\savepicture and \usepicture).
- (RN)
- Some code cleaning. (RN)
+ General: Changed marcro names (\savepicture and \usepicture).
+ (RN)
+ Some code cleaning. (RN)
v1.0o
- General: New code for “notightpage”. (RN)
- Option “fname” renamed to “showname”. (RN)
+ General: New code for “notightpage”. (RN)
+ Option “fname” renamed to “showname”. (RN)
v1.0p
- General: Some code and documentation cleaning. (RN)
+ General: Some code and documentation cleaning. (RN)
v1.0q
- \usepicture: Now \usepspicture works for all kind of graphics.
- (RN)
+ \usepicture: Now \usepspicture works for all kind of graphics.
+ (RN)
v1.0r
- \ppf at is@pdfTeX at graphic: Changed \ppf at is@known at graphic to
- \ppf at is@pdfTeX at graphic. Now pdfTEX graphics are
- prefered. (RN)
+ \ppf at is@pdfTeX at graphic: Changed \ppf at is@known at graphic to
+ \ppf at is@pdfTeX at graphic. Now pdfTeX graphics are
+ prefered. (RN)
v1.0s
- \Gin at ii: Rewritten. (RN)
- General: Scaling e.g. of PostScript pictures now only in
- extraction mode. Some code cleaning. (RN)
+ \Gin at ii: Rewritten. (RN)
+ General: Scaling e.g. of PostScript pictures now only in
+ extraction mode. Some code cleaning. (RN)
v1.1a
- General: Support for the internal PSTricks macro \pst at object.
- (HjG/RN)
+ General: Support for the internal PSTricks macro \pst at object.
+ (HjG/RN)
v1.1b
- General: Ignore the call of \nofiles inside of preview. (RN)
- Some code and documentation cleaning. (RN)
+ General: Ignore the call of \nofiles inside of preview. (RN)
+ Some code and documentation cleaning. (RN)
v1.1c
- General: New package option “tightpage” added. (RN)
- Special support for “tabularx”. (RN)
- Supress handling of pdfLaTeX graphic formats in DVI mode.
- (RN)
+ General: New package option “tightpage” added. (RN)
+ Special support for “tabularx”. (RN)
+ Supress handling of pdfLaTeX graphic formats in DVI mode.
+ (RN)
v1.1d
- postscript: Support for PSTricks environment “psmatrix”. (RN)
+ postscript: Support for PSTricks environment “psmatrix”. (RN)
v1.1e
- General: New option “displaymath” (see preview package).
- (HjG/RN)
+ General: New option “displaymath” (see preview package).
+ (HjG/RN)
v1.1f
- General: Package option “ignore” reimplemented. Now the
- compilation of the dtx file in LaTeX mode is possible.
- (RN)
+ General: Package option “ignore” reimplemented. Now the
+ compilation of the dtx file in LaTeX mode is possible.
+ (RN)
v1.1g
- postscript: “psmatrix” environment (preserve math mode).
- (RN/HjG)
- pspicture: pspicture environment must still parse its arguments.
- (RN/HjG)
+ postscript: “psmatrix” environment (preserve math mode).
+ (RN/HjG)
+ pspicture: pspicture environment must still parse its arguments.
+ (RN/HjG)
v1.1h
- \Ginclude at graphics: Check if inside of a PS-related environment
- (correct graphic inclusion). (RN)
+ \Ginclude at graphics: Check if inside of a PS-related environment
+ (correct graphic inclusion). (RN)
v1.1i
- \Ginclude at graphics: Correction of the inside check. (RN/HjG)
- General: \ifpr at outer must be predefined. (HjG/RN)
- Package option “final” also for “graphicx”. (RN)
+ \Ginclude at graphics: Correction of the inside check. (RN/HjG)
+ General: \ifpr at outer must be predefined. (HjG/RN)
+ Package option “final” also for “graphicx”. (RN)
v1.1k
- General: New environment pst-pdf-defs: Support for PSTricks
- environment “psmatrix” inside user definitions.
- (RN,HjG)
+ General: New environment pst-pdf-defs: Support for PSTricks
+ environment “psmatrix” inside user definitions.
+ (RN,HjG)
v1.1l
- General: Support for the package “psfragx”. (RN)
+ General: Support for the package “psfragx”. (RN)
v1.1m
- General: Merge english and german version of the documentation.
- (RN)
+ General: Merge english and german version of the documentation.
+ (RN)
v1.1n
- General: \nofiles added (suggestion of Torsten Bronger).
+ General: \nofiles added (suggestion of Torsten Bronger).
v1.1o
- \Gscale@@box: Disable scaling. (RN)
+ \Gscale@@box: Disable scaling. (RN)
v1.1p
- General: \nofiles makes \makeindex and \makeglossary to \relax.
- \@empty is better because of later \renewcommand’s.
-v1.1p1
- General: \let\output\@gobble before loading of “preview” added.
- (RN)
+ General: \let\output\@gobble before loading of “preview” added.
+ (RN)
+ \nofiles makes \makeindex and \makeglossary to \relax.
+ \@empty is better because of later \renewcommand’s.
v1.1q
- General: Problem with “tabularx” and “threeparttabel” solved.
- (RN)
+ General: Problem with “tabularx” and “threeparttabel” solved.
+ (RN)
v1.1r
- General: Fixed values for \PreviewBbAdjust because \paperwidth
- is not allways defined (suggested by Will Robertson).
+ General: Fixed values for \PreviewBbAdjust because \paperwidth
+ is not allways defined (suggested by Will Robertson).
v1.1s
- General: Dummy definition of the page key in DVI mode.
+ General: Dummy definition of the page key in DVI mode.
v1.1t
- General: Remove the line “\let\output\@gobble” because of bad
- side effects. (RN)
- postscript: Using environ the environment postscript is now
- simple and more robust. (RN)
+ General: Remove the line “\let\output\@gobble” because of bad
+ side effects. (RN)
+ postscript: Using environ the environment postscript is now
+ simple and more robust. (RN)
v1.1u
- General: \pdfoutput must be set when loading “pdftex.def” in DVI
- mode. (RN)
+ General: \pdfoutput must be set when loading “pdftex.def” in DVI
+ mode. (RN)
v1.1v
- \Gin at ii: Key settings only for pdf graphics. (RN)
- General: Local redefinition of \pdfoutput to be a counter. (RN)
+ \Gin at ii: Key settings only for pdf graphics. (RN)
+ General: Local redefinition of \pdfoutput to be a counter. (RN)
v1.2a
- General: Engine tests changed (RN)
+ General: Engine tests changed (RN)
v1.2b
- General: Loading packages ‘if*’ at wrong place (RN)
+ General: Loading packages ‘if*’ at wrong place (RN)
v1.2c
- General: “postscript” environment no more allowed before
- \begin{document} (changed example file).
+ General: “postscript” environment no more allowed before
+ \begin{document} (changed example file).
v1.2d
- General: \c at lor@to at ps must not be undefined before loading
- ‘PSTricks’
- Version parameter for ‘graphicx’ and rename \GPT at page to
- \Gin at page at several places
+ General: \c at lor@to at ps must not be undefined before loading
+ ‘PSTricks’
+ Version parameter for ‘graphicx’ and rename \GPT at page to
+ \Gin at page at several places
+v1.2e
+ \ppf at is@pdfTeX at graphic: Parameter #2 is detokenized when
+ expanded to \pdfTeXext
+ General: gobble optional argument for \makeindex, \makeglossary
+ and \printindex
Modified: trunk/Master/texmf-dist/doc/latex/pst-pdf/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pst-pdf/Makefile 2019-11-16 17:19:00 UTC (rev 52818)
+++ trunk/Master/texmf-dist/doc/latex/pst-pdf/Makefile 2019-11-16 22:14:52 UTC (rev 52819)
@@ -21,7 +21,7 @@
PDF_CONTAINER = $(EXAMPLE:.tex=-pics.pdf)
ARCHFILES = $(PACKAGE).dtx $(PACKAGE).ins $(ADDINPUTS) Makefile \
- README.md CHANGES CHANGES.tex \
+ README.md CHANGES \
$(PACKAGE).pdf $(PACKAGE)-DE.pdf $(EXAMPLE:.tex=.pdf) \
ps4pdf \
ps4pdf.bat \
@@ -43,7 +43,7 @@
$(EXAMPLE:.tex=.pdf) : $(EXAMPLE) $(ADDINPUTS) $(PDF_CONTAINER) $(PACKAGE).sty
$(PDFLATEX) $<
-dist : doc doc-DE pdf example
+dist : doc doc-DE pdf example CHANGES
rm -rf $(PACKAGE)
mkdir $(PACKAGE)
cp -p $(ARCHFILES) $(PACKAGE)/
Modified: trunk/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex 2019-11-16 17:19:00 UTC (rev 52818)
+++ trunk/Master/texmf-dist/source/latex/pst-pdf/CHANGES.tex 2019-11-16 22:14:52 UTC (rev 52819)
@@ -1,47 +0,0 @@
-% Rolf Niepraschk, <Rolf.Niepraschk at gmx.de>
-% Hubert Gaesslein
-% 2017-04-24
-\documentclass[draft]{ltxdoc}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[document]{ragged2e}
-\usepackage{calc}
-
-\renewcommand*\familydefault{\ttdefault}
-\renewcommand*\normalsize{\tiny}
-
-\AtBeginDocument{%
- \renewcommand*\usefont[4]{}\renewcommand*\selectfont{}}
-
-\normalfont \normalsize
-
-% Adobe Reader can't cope with \maxdimen ... :-(
-% 5080mm+32sp=947257376sp; 1sp mehr ... und die Schrift verschwindet!
-% 947257376sp ~= 14454pt ~= 200in ~= 14400bp
-\usepackage[%
- paperheight=947257376sp,paperwidth=\widthof{m}*72+2bp,
- left=1bp,right=1bp,top=0bp,bottom=0bp,verbose]{geometry}
-
-\makeatletter
-
-\renewenvironment{theglossary}
-{%
- \setlength\baselineskip{0pt}
- \renewcommand*\pfill{\@tempcnta=\number}
- \let\item\@idxitem \ignorespaces
-}{}
-
-\let\textlatin\@firstofone
-
-\makeatother
-
-\renewcommand*\TeX{TeX} \renewcommand*\LaTeX{LaTeX}% too late! RN.
-
-\setlength\parindent{0pt} \pagestyle{empty} \nofiles \raggedbottom
-
-\begin{document}
-
-\section*{Changes to \textsf{pst-pdf}:}
-\input{pst-pdf.gls}
-
-\end{document}
Modified: trunk/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx 2019-11-16 17:19:00 UTC (rev 52818)
+++ trunk/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx 2019-11-16 22:14:52 UTC (rev 52819)
@@ -24,7 +24,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{pst-pdf}
%<*package>
- [2017/06/22 v1.2d PS graphics for pdfLaTeX (RN,HjG)]
+ [2019/11/15 v1.2e PS graphics for pdfLaTeX (RN,HjG)]
%</package>
%
%<*driver>
@@ -50,7 +50,7 @@
%</driver>
% \fi
%
-% \CheckSum{832}
+% \CheckSum{839}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -76,7 +76,7 @@
% \changes{v1.0j}{2005/02/22}{Check AtBeginDocument for package
% `pstricks' even if ``nopstricks'' is given. (RN)}
% \changes{v1.0j}{2005/02/22}{For \cmd{\includegraphics}
-% \cmd{\usepicture} and |postscript| the new options ``frame'',
+% \cmd{\usepicture} and \string\verb+postscript+ the new options ``frame'',
% ``framesep'', ``framerule'', ``linewidth'', and ``ignore'' added. (RN)}
% \changes{v1.0l}{2005/02/25}{Options ``framesep'', ``framerule'',
% ``linewidth'' removed, ``fname'' and ``innerframe'' added. (RN)}
@@ -248,7 +248,7 @@
% Es werden zus\"atzlich die mathematischen Umgebungen
% \env{displaymath}, \env{eqnarray} und \env{\$\$} extrahiert und im
% pdf-Modus
-% als Grafik eingef\xFCgt. So k\"onnen zus\"atzliche PSTricks-Erg\"anzungen
+% als Grafik eingef\"ugt. So k\"onnen zus\"atzliche PSTricks-Erg\"anzungen
% leicht dem Inhalt dieser Umgebungen zugef\"ugt werden. (Frage: Wie
% verhalten sich die AMS\LaTeX-Umgebungen?)
%
@@ -484,7 +484,7 @@
% \cmd{\includegraphicx}\oarg{keys}\parg{pfxadd}\ooarg{ovpfgd}\oarg{ovpbgd}%
% \marg{filename}
% \par\noindent
-% Wie im Paket \pkgname{psfragx} definiert zu verwenden.
+% To be used like defined in package\pkgname{psfragx}.
% \medskip
%
% \DescribeMacro{\savepicture}
@@ -498,9 +498,8 @@
% \DescribeMacro{\usepicture}
% \cmd{\usepicture}\oarg{keys}\marg{name}
% \par\noindent
-% Die zuvor mit \cmd{\savepicture} gespeicherte Grafik wird
-% ausgegeben. Der optionale Parameter entpricht dem bei der Anweisung
-% \cmd{\includegraphics} m\"oglichen.
+% The graphic previously stored with \cmd{\savepicture} is outputted. The
+% optional parameter corresponds to \cmd{\includegraphics}.
% \medskip
%
% \DescribeEnv{pst-pdf-defs}
@@ -507,9 +506,9 @@
% \cmd{\begin}\texttt{\{pst-pdf-defs\}} \dots
% \cmd{\end}\texttt{\{pst-pdf-defs\}}
% \par\noindent
-% Sollen eigene Makros oder Umgebungen definiert werden, die das Zeichen
-% \texttt{\&} (andere?) im Ersetzungstext enthalten, so m\"ussen diese
-% Definitionen von der Umgebung |pst-pdf-defs| umschlossen werden.
+% For defining macros or environments, which contain character \texttt{\&}
+% (others?) in the output, these defintions have to be wrapped with
+% environment |pst-pdf-defs|.
% \medskip
% \fi
%
@@ -565,8 +564,8 @@
% \item[innerframe=\TorF] As in ``|frame|'', but the frame is drawn
% around the gra\-phics, not its box.
%
-% \item[ignore=\TorF] If ``|true|'' no graphics is output. With
-% \cmd{\savepicture}\marg{name} the graphics can be used later in a
+% \item[ignore=\TorF] If set to ``|true|'' no graphics are outputted. With
+% macro \cmd{\savepicture}\marg{name} the graphics can be used later in a
% different place via \cmd{\usepicture}. Default: false.
%
% \item[showname=\TorF] A caption of minimal font size records the used
@@ -729,6 +728,8 @@
% extensions. (RN)}
% \changes{v1.0r}{2005/03/25}{Changed \cmd{\ppf at is@known at graphic} to
% \cmd{\ppf at is@pdfTeX at graphic}. Now pdf\TeX\ graphics are prefered. (RN)}
+% \changes{v1.2e}{2019/11/15}{Parameter \string\verb+#2+ is detokenized when
+% expanded to \cmd{\pdfTeXext}}
% \ifGERMAN
% Parameter |#1| ist der Name einer Grafikdatei mit oder ohne Endung,
% Parameter |#2| enth\"alt die g\"ultigen Dateiendungen im pdf-Modus,
@@ -747,7 +748,7 @@
\newcommand*\ppf at is@pdfTeX at graphic[5]{%
\@ppf at pdftex@graphicfalse%
\begingroup
- \edef\pdfTeXext{#2}%
+ \edef\pdfTeXext{\detokenize\expandafter{#2}}%
% \end{macrocode}
% \ifGERMAN
% Statt Einladen einer identifizierten Grafik nur Test der Grafikendung.
@@ -757,9 +758,8 @@
% \fi
% \begin{macrocode}
\def\Gin at setfile##1##2##3{%
- \edef\@tempb{##2}%
- \@for\@tempa:=\pdfTeXext\do{%
- \ifx\@tempa\@tempb\global\@ppf at pdftex@graphictrue\fi}}%
+ \@expandtwoargs\in@{,\detokenize\expandafter{##2},}{,\pdfTeXext,}%
+ \ifin@\global\@ppf at pdftex@graphictrue\fi}%
% \end{macrocode}
% \ifGERMAN
% Es m\"ussen Dateitypen beider Moden gefunden werden, um
@@ -817,12 +817,17 @@
% \changes{v1.1p}{2007/06/04}{\cmd{\nofiles} makes \cmd{\makeindex} and
% \cmd{\makeglossary} to \cmd{\relax}. \cmd{\@empty} is better
% because of later \cmd{\renewcommand}'s.}
+% \changes{v1.2e}{2019/11/15}{gobble optional argument for \cmd{\makeindex},
+% \cmd{\makeglossary} and \cmd{\printindex}}
% \changes{v1.1q}{2008/02/17}{\cmd{\overfullrule} must not be > 0.}
% \begin{macrocode}
\PackageInfo{pst-pdf}{%
MODE: \ppf at TeX@mode\space (dvi -- extraction mode)}
\nofiles
- \let\makeindex\@empty \let\makeglossary\@empty
+ \let\makeindex\@empty \let\makeglossary\@empty \let\printindex\@empty
+ \renewcommand*\makeindex[1][]{}%
+ \renewcommand*\makeglossary[1][]{}%
+ \renewcommand*\printindex[1][]{}%
\AtBeginDocument{\overfullrule=\z@}%
\if at ppf@PST at used\RequirePackage{pstricks}\fi
\RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
@@ -1092,7 +1097,7 @@
\ifpr at outer
% \end{macrocode}
% \ifGERMAN
-% Im allgemeinen Fall sollen pdf\TeX-Grafiken bevorzugt werden (Einf\xFCgen
+% Im allgemeinen Fall sollen pdf\TeX-Grafiken bevorzugt werden (Einf\"ugen
% erst im pdf\TeX-Modus). Ist nur eine DVIPS-Graphik vorhanden, dann
% wirkt wieder die Originaldefintion und Registrierung beim
% preview-Paket muss erfolgen.
@@ -1188,7 +1193,9 @@
% \fi
% \begin{macrocode}
\PSTricksOff
- \@ifundefined{c at lor@to at ps}{\def\c at lor@to at ps#1 #2\@@{}}{}}}%
+ \def\c at lor@to at ps#1 #2\@@{}
+ }%
+ }%
% \end{macrocode}
% \ifGERMAN
% \PS-Ausgabe jetzt verhindern und sp\"ater noch einmal.
@@ -1225,7 +1232,7 @@
% \fi
% \changes{v1.1b}{2005/04/09}{Ignore the call of
% \cmd{\nofiles} inside of \pkgname{preview}. (RN)}
-% \changes{v1.1p1}{2007/07/27}{\cmd{\let}\cmd{\output}\cmd{\@gobble}
+% \changes{v1.1p}{2007/07/27}{\cmd{\let}\cmd{\output}\cmd{\@gobble}
% before loading of ``preview'' added. (RN)}
% \changes{v1.1t}{2008/09/09}{Remove the line
% ``\cmd{\let}\cmd{\output}\cmd{\@gobble}'' because of bad side
@@ -1576,7 +1583,7 @@
% \ifGERMAN
% Die im pdf\TeX-Modus unn\"utze Umdefinition von
% \cmd{\includegraphics} (Paket \pkgname{psfragx}) f\"uhrt zu zweifachem
-% Einf\xFCgen des Ergebnisses, weshalb die Originaldefition wiederhergestellt
+% Einf\"ugen des Ergebnisses, weshalb die Originaldefition wiederhergestellt
% wird.
% \fi
% \ifENGLISH
Modified: trunk/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty 2019-11-16 17:19:00 UTC (rev 52818)
+++ trunk/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty 2019-11-16 22:14:52 UTC (rev 52819)
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{pst-pdf}
- [2017/06/22 v1.2d PS graphics for pdfLaTeX (RN,HjG)]
+ [2019/11/15 v1.2e PS graphics for pdfLaTeX (RN,HjG)]
\newcommand*\ppf at TeX@mode{-1}
\newcommand*\ppf at draft{false}
\newif\if at ppf@PST at used\@ppf at PST@usedtrue
@@ -87,11 +87,10 @@
\newcommand*\ppf at is@pdfTeX at graphic[5]{%
\@ppf at pdftex@graphicfalse%
\begingroup
- \edef\pdfTeXext{#2}%
+ \edef\pdfTeXext{\detokenize\expandafter{#2}}%
\def\Gin at setfile##1##2##3{%
- \edef\@tempb{##2}%
- \@for\@tempa:=\pdfTeXext\do{%
- \ifx\@tempa\@tempb\global\@ppf at pdftex@graphictrue\fi}}%
+ \@expandtwoargs\in@{,\detokenize\expandafter{##2},}{,\pdfTeXext,}%
+ \ifin@\global\@ppf at pdftex@graphictrue\fi}%
\edef\Gin at extensions{#2,#3}%
\pr at outerfalse\ppf at Ginclude@graphics{#1}%
\endgroup
@@ -101,7 +100,10 @@
\PackageInfo{pst-pdf}{%
MODE: \ppf at TeX@mode\space (dvi -- extraction mode)}
\nofiles
- \let\makeindex\@empty \let\makeglossary\@empty
+ \let\makeindex\@empty \let\makeglossary\@empty \let\printindex\@empty
+ \renewcommand*\makeindex[1][]{}%
+ \renewcommand*\makeglossary[1][]{}%
+ \renewcommand*\printindex[1][]{}%
\AtBeginDocument{\overfullrule=\z@}%
\if at ppf@PST at used\RequirePackage{pstricks}\fi
\RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
@@ -222,7 +224,9 @@
\let\Gin at PS@raw\@gobble\let\Gin at PS@restored\@gobble
\@ifundefined{PSTricksLoaded}{}{%
\PSTricksOff
- \@ifundefined{c at lor@to at ps}{\def\c at lor@to at ps#1 #2\@@{}}{}}}%
+ \def\c at lor@to at ps#1 #2\@@{}
+ }%
+ }%
\the\@temptokena
\expandafter\AtBeginDocument\expandafter
{\the\@temptokena\@temptokena{}}%
More information about the tex-live-commits
mailing list