diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-13 22:05:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-13 22:05:58 +0000 |
commit | 9c81c7895426957aac1406ed821d52edb456f85b (patch) | |
tree | 8916b210382241519a53779b66df67d86619d375 | |
parent | ce7643832e815cb88d6b094fd4a6230d6b8df779 (diff) |
pst2pdf (14sep17)
git-svn-id: svn://tug.org/texlive/trunk@45290 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/pst2pdf/pst2pdf.pl | 10 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 64 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst2pdf/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst2pdf/README | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib | 84 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf | bin | 76775 -> 78833 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex | 36 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/pst2pdf/pst2pdf.pl | 10 |
8 files changed, 150 insertions, 58 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pst2pdf/pst2pdf.pl b/Build/source/texk/texlive/linked_scripts/pst2pdf/pst2pdf.pl index 01b7a946e5f..6ce08cb98fe 100755 --- a/Build/source/texk/texlive/linked_scripts/pst2pdf/pst2pdf.pl +++ b/Build/source/texk/texlive/linked_scripts/pst2pdf/pst2pdf.pl @@ -5,7 +5,7 @@ use strict; # to be sure, that all is safe ... :-) use v5.18; # $Id: pst2pdf.pl 119 2014-09-24 12:04:09Z herbert $ # v. 0.16 2014-09-14 simplify the use of PSTricks with pdf -# 2014-09-24 (c) Herbert Voss <hvoss@tug.org> +# 2017-09-11 (c) Herbert Voss <hvoss@tug.org> # Pablo González Luengo <pablogonz@yahoo.com> # # This program is free software; you can redistribute it and/or modify @@ -59,10 +59,10 @@ my $other = "other"; # search other verbatim environment #---------------- Program identification, options and help ------------- my $program = 'pst2pdf'; -my $nv='v0.16'; -my $ident = '$Id: pst2pdf.pl 119 2014-09-24 12:04:09Z herbert $'; +my $nv='v0.17'; +my $ident = '$Id: pst2pdf.pl 119 2017-09-11 12:04:09Z herbert $'; my $copyright = <<END_COPYRIGHT ; -Copyright 2011-2014 (c) Herbert Voss <hvoss\@tug.org> and Pablo González. +Copyright 2011-2017 (c) Herbert Voss <hvoss\@tug.org> and Pablo González. END_COPYRIGHT my $licensetxt= <<END_LICENSE ; This program is free software; you can redistribute it and/or modify @@ -502,7 +502,7 @@ my $archivo; close $ENTRADA; ## Partición del documento -my($cabeza,$cuerpo,$final) = $archivo =~ m/\A (.+? ^\\begin{document}) (.+) (^ \\end{document} .*) \z/msx; +my($cabeza,$cuerpo,$final) = $archivo =~ m/\A (.+? ^\\begin\{document\}) (.+) (^ \\end\{document\} .*) \z/msx; ## Variables y constantes my $no_del = "\0"; diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 044438f55c8..c3d64c0bf41 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 45190 2017-09-01 08:01:01Z preining $ +# $Id: tlmgr.pl 45275 2017-09-12 00:47:29Z preining $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 45190 $'; -my $datrev = '$Date: 2017-09-01 10:01:01 +0200 (Fri, 01 Sep 2017) $'; +my $svnrev = '$Revision: 45275 $'; +my $datrev = '$Date: 2017-09-12 02:47:29 +0200 (Tue, 12 Sep 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -3702,9 +3702,9 @@ sub show_one_package_detail { print "installed: No\n"; return($F_OK); } - #if (!$remotetlpdb) { - # init_tlmedia_or_die(); - #} + if (!$remotetlpdb) { + init_tlmedia_or_die(1); + } if (defined($tag)) { if (!$remotetlpdb->is_virtual) { tlwarn("$prg: specifying implicit tags not allowed for non-virtual databases!\n"); @@ -3724,40 +3724,34 @@ sub show_one_package_detail { tlwarn("$prg: Cannot find package $pkg in repository $tag\n"); return($F_WARNING); } - if ($remotetlpdb->is_virtual) { + my @cand = $remotetlpdb->candidates($pkg); + if (@cand) { + # if @cand is not empty, then we have a virtual database # we might have a package that is available in a # subsidiary repository, but not installable # because it is not pinned # we will list it but warn about this fact - my @cand = $remotetlpdb->candidates($pkg); - if (@cand) { - my $first = shift @cand; - if (defined($first)) { - tlwarn("$prg: strange, we have a first candidate but no tlp: $pkg\n"); - return($F_WARNING); - } - # already shifted away the first element - if ($#cand >= 0) { - # recursively showing all tags, but warn - print "package: ", $pkg, "\n"; - print "WARNING: This package is not pinned but present in subsidiary repositories\n"; - print "WARNING: As long as it is not pinned it is not installable.\n"; - print "WARNING: Listing all available copies of the package.\n"; - my @aaa; - for my $a (@cand) { - my ($t,$r) = split(/\//, $a, 2); - push @aaa, "$pkg" . '@' . $t; - } - $ret |= action_info(@aaa); - return($ret); - } else { - tlwarn("$prg: strange, package listed but no residual candidates: $pkg\n"); - return($F_WARNING); - } - } else { - tlwarn("$prg: strange, package listed but no candidates: $pkg\n"); + # useless test, @cand will always be defined becuase $remotetlpdb is virtual + my $first = shift @cand; + if (defined($first)) { + tlwarn("$prg: strange, we have a first candidate but no tlp: $pkg\n"); return($F_WARNING); } + # already shifted away the first element + if ($#cand >= 0) { + # recursively showing all tags, but warn + print "package: ", $pkg, "\n"; + print "WARNING: This package is not pinned but present in subsidiary repositories\n"; + print "WARNING: As long as it is not pinned it is not installable.\n"; + print "WARNING: Listing all available copies of the package.\n"; + my @aaa; + for my $a (@cand) { + my ($t,$r) = split(/\//, $a, 2); + push @aaa, "$pkg" . '@' . $t; + } + $ret |= action_info(@aaa); + return($ret); + } } # we didn't find a package like this, so use search info("$prg: cannot find package $pkg, searching for other matches:\n"); @@ -9078,7 +9072,7 @@ This script and its documentation were written for the TeX Live distribution (L<http://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 45190 2017-09-01 08:01:01Z preining $ +$Id: tlmgr.pl 45275 2017-09-12 00:47:29Z preining $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/latex/pst2pdf/Changes b/Master/texmf-dist/doc/latex/pst2pdf/Changes index 3aaf4ab41ed..f08b9e2f413 100644 --- a/Master/texmf-dist/doc/latex/pst2pdf/Changes +++ b/Master/texmf-dist/doc/latex/pst2pdf/Changes @@ -1,4 +1,5 @@ pst2pdf.pl -------- +0.17 2017-09-11 - fix escape character in regex 0.16 2014-09-14 - using gs for split pdf (no more pdftk) - support package pst-exa for examples - adding svg image support diff --git a/Master/texmf-dist/doc/latex/pst2pdf/README b/Master/texmf-dist/doc/latex/pst2pdf/README index 75ca92173dd..b59e3919cf8 100644 --- a/Master/texmf-dist/doc/latex/pst2pdf/README +++ b/Master/texmf-dist/doc/latex/pst2pdf/README @@ -1,4 +1,3 @@ -<pre> pst2pdf is a Perl script which isolates all PostScript or PSTricks related parts of the TeX document into single LaTeX files, for which an eps and pdf image is created. @@ -33,7 +32,6 @@ pdflatex, which then creates file-pdf.pdf. The created images are named file-fig-<No>.pdf Options: -Options: -h,--help - display this help and exit -l,--license - display license information and exit -v,--version - display version (current $nv) and exit @@ -59,4 +57,3 @@ Options: for more documentation => pst2pdf --help or read the documentation -- Herbert Voss 2010-01-04 -</pre> diff --git a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib new file mode 100644 index 00000000000..4bac6f923ea --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib @@ -0,0 +1,84 @@ +@STRING{tugboat = {TUGboat} } +@STRING{beiprogramm = {{\TeX}-Beiprogramm} } +@STRING{bretter = {Bretter, die die Welt bedeuten} } +@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{editorial = {Editorial} } +@STRING{fremdebuehne = {Von fremden B{\"u}hnen} } +@STRING{fundus = {Aus dem Fundus} } +@STRING{hinterbuehne = {Hinter der B{\"u}hne} } +@STRING{leserbrief = {Leserbrief(e)} } +@STRING{magazin = {Magazin} } +@STRING{rezension = {Rezensionen} } +@STRING{schonimmer = {Was Sie schon immer {\"u}ber {\TeX} wissen wollten \dots} } +@STRING{theaterkasse = {Von der Theaterkasse} } +@STRING{theatertage = {{\TeX}-Theatertage} } + +@Book{tlgc2, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, + title = {The {\LaTeX} {G}raphics {C}ompanion}, + publisher = {{Addison-Wesley Publishing Company}}, + edition = 2, + year = {2007}, + address = {Reading, Mass.} +} + + +@Article{girou:01:, + author = {Denis Girou}, + title = {Pr\'esentation de {PST}ricks}, + journal = {Cahier {GUT}enberg}, + year = 1994, + volume = {16}, + month = apr, + pages = {21-70} +} + +@Article{girou:02:, + author = {{Timothy van} Zandt and Denis Girou}, + title = {Inside {PST}ricks}, + journal = TUGboat, + year = 1994, + volume = {15}, + month = sep, + pages = {239-246} +} + +@Manual{pstricks, + Title = {PSTricks - {\PS} macros for generic {\TeX}}, + Author = {{Timothy van} Zandt}, + Address = {\url{http://www.tug.org/application/PSTricks}}, + year = 1993 +} + +@Book{PSTricks2, + author = {Herbert Vo\ss}, + title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {7}, + publisher = {DANTE -- Lehmanns}, + year = {2010}, + address = {Heidelberg/Berlin} +} + +@Book{PSTricks2-UIT, + author = {Herbert Vo\ss}, + title = {PSTricks -- Graphics for \TeX\ and \LaTeX}, + publisher = {UIT}, + year = {2011}, + address = {Cambridge} +} + +@Book{LaTeXRef-UIT, + author = {Herbert Vo\ss}, + title = {{\LaTeX} quick reference}, + publisher = {UIT}, + year = {2012}, + address = {Cambridge} +} + +@Manual{pst-tools, + author = {Herbert Voß}, + title = {\texttt{pst-tools} -- Helper functions}, + publisher = {CTAN}, + year = {2012}, + address = {\url{CTAN:/graphics/pstricks/contrib/pst-tools}} +} diff --git a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf Binary files differindex 226845234cb..961b7f7cb52 100644 --- a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf +++ b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf diff --git a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex index 7a59358ff9d..65457a04090 100644 --- a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex +++ b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex @@ -1,6 +1,25 @@ -\documentclass[10pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} +% arara: latex: {draft: yes} +% arara: latex: {draft: yes} +% arara: biber +% arara: makeindex +% arara: latex +% arara: dvips +% arara: ps2pdf +% arara: clean: { files:[PSTricks.bib,pst2pdf-doc.out, pst2pdf-doc.ps, pst2pdf-doc.toc,pst2pdf-doc.log,pst2pdf-doc.ind,pst2pdf-doc.aux, pst2pdf-doc.bbl, pst2pdf-doc.bcf, pst2pdf-doc.blg,pst2pdf-doc.dvi,pst2pdf-doc.idx,pst2pdf-doc.ilg,pst2pdf-doc.run.xml] } +\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside]{pst-doc} + +\listfiles +\let\Lfile\LFile \usepackage[utf8]{inputenc} +\usepackage{pst-node} +\let\pstnodeFV\fileversion +\let\pstnodeFD\filedate +%\usepackage{pst-node} +\usepackage{biblatex} + +\addbibresource{\jobname.bib} + \RequirePackage{xspace} \usepackage{pst-text,pst-grad} \let\pstFV\fileversion @@ -16,7 +35,7 @@ \begin{document} \title{\texttt{pst2pdf}} -\subtitle{Running a PSTricks document with pdflatex;\\ \small v. 0.16} +\subtitle{Running a PSTricks document with pdflatex;\\ \small v. 0.17} \author{Herbert Vo\ss \\ Pablo Gonz\'{a}lez Luengo} \docauthor{} \date{\today} @@ -177,13 +196,10 @@ If you need to create other image formats use \nxLprog{pst2pdf}, move to images \nxLprog{mogrify} -format tiff \OptArg*{*.ppm} \end{BDef} generate \Lext{tiff} images files. -\newpage -% -\bgroup -\raggedright +%\newpage +\clearpage \nocite{*} -\bibliographystyle{plain} -\bibliography{pst2pdf-doc} -\egroup +\printbibliography + \printindex \end{document} diff --git a/Master/texmf-dist/scripts/pst2pdf/pst2pdf.pl b/Master/texmf-dist/scripts/pst2pdf/pst2pdf.pl index 01b7a946e5f..6ce08cb98fe 100755 --- a/Master/texmf-dist/scripts/pst2pdf/pst2pdf.pl +++ b/Master/texmf-dist/scripts/pst2pdf/pst2pdf.pl @@ -5,7 +5,7 @@ use strict; # to be sure, that all is safe ... :-) use v5.18; # $Id: pst2pdf.pl 119 2014-09-24 12:04:09Z herbert $ # v. 0.16 2014-09-14 simplify the use of PSTricks with pdf -# 2014-09-24 (c) Herbert Voss <hvoss@tug.org> +# 2017-09-11 (c) Herbert Voss <hvoss@tug.org> # Pablo González Luengo <pablogonz@yahoo.com> # # This program is free software; you can redistribute it and/or modify @@ -59,10 +59,10 @@ my $other = "other"; # search other verbatim environment #---------------- Program identification, options and help ------------- my $program = 'pst2pdf'; -my $nv='v0.16'; -my $ident = '$Id: pst2pdf.pl 119 2014-09-24 12:04:09Z herbert $'; +my $nv='v0.17'; +my $ident = '$Id: pst2pdf.pl 119 2017-09-11 12:04:09Z herbert $'; my $copyright = <<END_COPYRIGHT ; -Copyright 2011-2014 (c) Herbert Voss <hvoss\@tug.org> and Pablo González. +Copyright 2011-2017 (c) Herbert Voss <hvoss\@tug.org> and Pablo González. END_COPYRIGHT my $licensetxt= <<END_LICENSE ; This program is free software; you can redistribute it and/or modify @@ -502,7 +502,7 @@ my $archivo; close $ENTRADA; ## Partición del documento -my($cabeza,$cuerpo,$final) = $archivo =~ m/\A (.+? ^\\begin{document}) (.+) (^ \\end{document} .*) \z/msx; +my($cabeza,$cuerpo,$final) = $archivo =~ m/\A (.+? ^\\begin\{document\}) (.+) (^ \\end\{document\} .*) \z/msx; ## Variables y constantes my $no_del = "\0"; |