summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-11 23:11:45 +0000
committerKarl Berry <karl@freefriends.org>2015-11-11 23:11:45 +0000
commit1d9414683ac75b19a10ac34fce703ebe7706e459 (patch)
tree860e31afcb9f8af9fccc79095119e15d6aeb3f26
parente5b087f9942a47a32c980275973792871b99f57f (diff)
pstricks (11nov15)
git-svn-id: svn://tug.org/texlive/trunk@38821 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.latex4
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-doc.bst1373
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news09.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news10.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news11.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news12.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news13.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news14.tex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news15.pdfbin279960 -> 284406 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news15.tex13
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg3
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg5
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/textures.cfg3
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg3
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex22
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-doc.cls18
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty28
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty204
23 files changed, 1521 insertions, 182 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes b/Master/texmf-dist/doc/generic/pstricks/Changes
index 58ef4d16ea9..6eec339ed9c 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes
@@ -1,3 +1,4 @@
+2015-11-11 - updated news2015
2015-07-25 - updated news2015
2015-06-29 - new news2015
2014-08-28 - updated news2014
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index d6034fc8b25..60de386381d 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -2,6 +2,8 @@ pstricks.tex --------
versions like 2.47a have only changes in other files, but not
in this main package.
+2.64a 2015-11-11 - new package pstricks-pdf.sty
+2.64 2015-10-09 - fix for xetex and \psput@special
2.63 2015-09-11 - fix for xetex and \psput@special
2.62a 2015-07-27 - upload the correct pstricks.sty
2.62 2015-07-24 - added optional argument bgcolor
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index f909ad4d5d9..e3c6fa58c5b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -1,7 +1,11 @@
Main version number is that of pstricks.tex
+pstricks-pdf.sty --------
+0.01 2015-11-11 - itial version
+
pstricks.sty --------
+0.61 2015-11-11 - move auto-pst-pdf to a new package
0.60 2013-12-12 - test, if babel was loaded for \shorthandoff
0.59 2013-10-21 - fix for introduced bug with ifpdf
0.58 2013-10-20 - fix for \usepackage[pdf]{pstricks} when using
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.bst b/Master/texmf-dist/doc/generic/pstricks/pst-doc.bst
new file mode 100644
index 00000000000..52759e253ca
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-doc.bst
@@ -0,0 +1,1373 @@
+%%
+%% This is file `dtk.bst'
+%%
+%% version 1.3, 2013-01-26
+%% copyright 2013 by DANTE e.V.
+%%
+ %-------------------------------------------------------------------
+ % For use with BibTeX version 0.99a or later
+ %-------------------------------------------------------------------
+ % This bibliography style file is intended for texts in
+ % GERMAN
+ % This is a numerical citation style, and as such is standard LaTeX.
+ % It requires no extra package to interface to the main text.
+ % The form of the \bibitem entries is
+ % \bibitem{key}...
+ % Usage of \cite is as follows:
+ % \cite{key} ==>> [#]
+ % \cite[chap. 2]{key} ==>> [#, chap. 2]
+ % where # is a number determined by the ordering in the reference list.
+ % This is alphabetical by authors.
+ %---------------------------------------------------------------------
+
+ENTRY
+ { abstracts
+ address
+ author
+ booktitle
+ chapter
+ ctanurl
+ edition
+ editor
+ howpublished
+ institution
+ journal
+ key
+ month
+ note
+ number
+ organization
+ pages
+ publisher
+ school
+ series
+ title
+ type
+ url
+ urldate
+ volume
+ year
+ }
+ {}
+ { label }
+
+INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+
+FUNCTION {init.state.consts}
+{ #0 'before.all :=
+ #1 'mid.sentence :=
+ #2 'after.sentence :=
+ #3 'after.block :=
+}
+
+STRINGS { s t }
+
+FUNCTION {output.nonnull}
+{ 's :=
+ output.state mid.sentence =
+ { "; " * write$ }
+ { output.state after.block =
+ { add.period$ write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { add.period$ " " * write$ }
+ if$
+ }
+ if$
+ mid.sentence 'output.state :=
+ }
+ if$
+ s
+}
+
+FUNCTION {output}
+{ duplicate$ empty$
+ 'pop$
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {output.check}
+{ 't :=
+ duplicate$ empty$
+ { pop$ "empty " t * " in " * cite$ * warning$ }
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {fin.entry}
+{ add.period$
+ write$
+ newline$
+}
+
+FUNCTION {new.block}
+{ output.state before.all =
+ 'skip$
+ { after.block 'output.state := }
+ if$
+}
+
+FUNCTION {new.sentence}
+{ output.state after.block =
+ 'skip$
+ { output.state before.all =
+ 'skip$
+ { after.sentence 'output.state := }
+ if$
+ }
+ if$
+}
+
+FUNCTION {add.blank}
+{ " " * before.all 'output.state :=
+}
+
+FUNCTION {add.colon}
+{ empty$
+ 'skip$
+ { before.all 'output.state := ":" output add.blank }
+ if$
+}
+
+FUNCTION {date.block}
+{
+ skip$
+}
+
+FUNCTION {not}
+{ { #0 }
+ { #1 }
+ if$
+}
+
+FUNCTION {and}
+{ 'skip$
+ { pop$ #0 }
+ if$
+}
+
+FUNCTION {or}
+{ { pop$ #1 }
+ 'skip$
+ if$
+}
+
+FUNCTION {non.stop}
+{ duplicate$
+ "}" * add.period$
+ #-1 #1 substring$ "." =
+}
+
+FUNCTION {new.block.checka}
+{ empty$
+ 'skip$
+ 'new.block
+ if$
+}
+
+FUNCTION {new.block.checkb}
+{ empty$
+ swap$ empty$
+ and
+ 'skip$
+ 'new.block
+ if$
+}
+
+FUNCTION {new.sentence.checka}
+{ empty$
+ 'skip$
+ 'new.sentence
+ if$
+}
+
+FUNCTION {new.sentence.checkb}
+{ empty$
+ swap$ empty$
+ and
+ 'skip$
+ 'new.sentence
+ if$
+}
+
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+}
+
+FUNCTION {emphasize}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "{\em " swap$ * "\/}" * }
+ if$
+}
+
+FUNCTION {capitalize}
+{ "u" change.case$ "t" change.case$ }
+
+FUNCTION {space.word}
+{ " " swap$ * " " * }
+
+ % Here are the language-specific definitions for explicit words.
+ % Each function has a name bbl.xxx where xxx is the English word.
+ %-------------------------------------------------------------------
+ % The original source file contains the following version information:
+ % \ProvidesFile{german.mbs}[1995/10/25 1.4 (PWD)]
+ % Copyright (C) 1994, 1995 Patrick W. Daly
+ %-------------------------------------------------------------------
+
+ % The language selected here is GERMAN
+FUNCTION {bbl.and}
+{ "und"}
+
+FUNCTION {bbl.editors}
+{ "Hg." }
+
+FUNCTION {bbl.editor}
+{ "Hg." }
+
+FUNCTION {bbl.edby}
+{ "herausgegeben von" }
+
+FUNCTION {bbl.edition}
+{ "Aufl." }
+
+FUNCTION {bbl.volume}
+{ "Bd." }
+
+FUNCTION {bbl.of}
+{ "von" }
+
+FUNCTION {bbl.number}
+{ "Nr." }
+
+FUNCTION {bbl.nr}
+{ "Nr." }
+
+FUNCTION {bbl.in}
+{ "in" }
+
+FUNCTION {bbl.pages}
+{ "S." }
+
+FUNCTION {bbl.page}
+{ "S." }
+
+FUNCTION {bbl.chapter}
+{ "Kap." }
+
+FUNCTION {bbl.techrep}
+{ "{Techn.\ Ber.}" }
+
+FUNCTION {bbl.mthesis}
+{ "Diplomarbeit" }
+
+FUNCTION {bbl.phdthesis}
+{ "Dissertation" }
+
+FUNCTION {bbl.first}
+{ "1." }
+
+FUNCTION {bbl.second}
+{ "2." }
+
+FUNCTION {bbl.third}
+{ "3." }
+
+FUNCTION {bbl.fourth}
+{ "4." }
+
+FUNCTION {bbl.fifth}
+{ "5." }
+
+FUNCTION {bbl.th}
+{ "." }
+
+MACRO {jan} {"Jan."}
+
+MACRO {feb} {"Febr."}
+
+MACRO {mar} {"M\^^b{a}rz"}
+
+MACRO {apr} {"Apr."}
+
+MACRO {may} {"Mai"}
+
+MACRO {jun} {"Juni"}
+
+MACRO {jul} {"Juli"}
+
+MACRO {aug} {"Aug."}
+
+MACRO {sep} {"Sept."}
+
+MACRO {oct} {"Okt."}
+
+MACRO {nov} {"Nov."}
+
+MACRO {dec} {"Dez."}
+
+ % End of language definition file
+
+
+MACRO{DTK}{"Die \TeX nische Ko\-mö\-die"}
+MACRO{TUGboat}{"TUGboat"}
+MACRO{TTN}{"\TeX{} and TUG News"}
+MACRO {acmcs} {"ACM Computing Surveys"}
+
+MACRO {acta} {"Acta Informatica"}
+
+MACRO {cacm} {"Communications of the ACM"}
+
+MACRO {ibmjrd} {"IBM Journal of Research and Development"}
+
+MACRO {ibmsj} {"IBM Systems Journal"}
+
+MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
+
+MACRO {ieeetc} {"IEEE Transactions on Computers"}
+
+MACRO {ieeetcad} {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
+
+MACRO {ipl} {"Information Processing Letters"}
+
+MACRO {jacm} {"Journal of the ACM"}
+
+MACRO {jcss} {"Journal of Computer and System Sciences"}
+
+MACRO {scp} {"Science of Computer Programming"}
+
+MACRO {sicomp} {"SIAM Journal on Computing"}
+
+MACRO {tocs} {"ACM Transactions on Computer Systems"}
+
+MACRO {tods} {"ACM Transactions on Database Systems"}
+
+MACRO {tog} {"ACM Transactions on Graphics"}
+
+MACRO {toms} {"ACM Transactions on Mathematical Software"}
+
+MACRO {toois} {"ACM Transactions on Office Information Systems"}
+
+MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"}
+
+MACRO {tcs} {"Theoretical Computer Science"}
+
+INTEGERS { nameptr namesleft numnames }
+
+FUNCTION {format.names}
+{ 's :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ { s nameptr
+ "{ff~}{vv~}{ll}{, jj}" format.name$ 't :=
+ nameptr #1 >
+ {
+ nameptr #3 =
+ numnames #3 > and
+ { "others" 't :=
+ #1 'namesleft := }
+ 'skip$
+ if$
+ namesleft #1 >
+ { ", " * t * }
+ {
+ t "others" =
+ { " et~al." * }
+ { bbl.and space.word * t * }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {format.names.ed}
+{ 's :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ { s nameptr
+ "{ff~}{vv~}{ll}{, jj}"
+ format.name$ 't :=
+ nameptr #1 >
+ {
+ namesleft #1 >
+ { ", " * t * }
+ {
+ t "others" =
+ { " et~al." * }
+ { bbl.and space.word * t * }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {format.authors}
+{ author empty$
+ { "" }
+ {
+ author format.names
+ }
+ if$
+}
+
+FUNCTION {format.editors}
+{ editor empty$
+ { "" }
+ {
+ editor format.names
+ editor num.names$ #1 >
+ { " (" * bbl.editors * ")" * }
+ { " (" * bbl.editor * ")" * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.in.editors}
+{ editor empty$
+ { "" }
+ { editor format.names.ed
+ }
+ if$
+}
+
+FUNCTION {format.title}
+{ title empty$
+ { "" }
+ { title
+ emphasize
+ }
+ if$
+}
+
+FUNCTION {output.bibitem}
+{ newline$
+ "\bibitem{" write$
+ cite$ write$
+ "}" write$
+ newline$
+ ""
+ before.all 'output.state :=
+}
+
+FUNCTION {n.dashify}
+{ 't :=
+ ""
+ { t empty$ not }
+ { t #1 #1 substring$ "-" =
+ { t #1 #2 substring$ "--" = not
+ { "--" *
+ t #2 global.max$ substring$ 't :=
+ }
+ { { t #1 #1 substring$ "-" = }
+ { "-" *
+ t #2 global.max$ substring$ 't :=
+ }
+ while$
+ }
+ if$
+ }
+ { t #1 #1 substring$ *
+ t #2 global.max$ substring$ 't :=
+ }
+ if$
+ }
+ while$
+}
+
+FUNCTION {word.in}
+{ bbl.in
+ " " * }
+
+FUNCTION {format.date}
+{ year empty$
+ { month empty$
+ { "" }
+ { "there's a month but no year in " cite$ * warning$
+ month
+ }
+ if$
+ }
+ { month empty$
+ 'year
+% { month ", " * year * }
+ { month "~" * year * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.url}
+{ url empty$
+ {""}
+ {"\url{" url * "}" * }
+ if$
+}
+
+FUNCTION {format.ctanurl}
+{ ctanurl empty$
+ {""}
+ {"\ctanurl{" ctanurl * "}" * }
+ if$
+}
+
+
+FUNCTION {format.urldate}
+{ urldate empty$
+ {""}
+% {'skip$}
+ {"zuletzt besucht: " urldate *}
+ if$
+}
+
+FUNCTION {format.btitle}
+{ title emphasize
+}
+
+FUNCTION {tie.or.space.connect}
+{ duplicate$ text.length$ #3 <
+ { "~" }
+ { " " }
+ if$
+ swap$ * *
+}
+
+FUNCTION {either.or.check}
+{ empty$
+ 'pop$
+ { "can't use both " swap$ * " fields in " * cite$ * warning$ }
+ if$
+}
+
+FUNCTION {format.bvolume}
+{ volume empty$
+ { "" }
+ { bbl.volume volume tie.or.space.connect
+ series empty$
+ 'skip$
+ { bbl.of space.word * series emphasize * }
+ if$
+ "volume and number" number either.or.check
+ }
+ if$
+}
+
+FUNCTION {format.number.series}
+{ volume empty$
+ { number empty$
+ { series field.or.null }
+ { output.state mid.sentence =
+ { bbl.number }
+ { bbl.number capitalize }
+ if$
+ number tie.or.space.connect
+ series empty$
+ { "there's a number but no series in " cite$ * warning$ }
+ { bbl.in space.word * series * }
+ if$
+ }
+ if$
+ }
+ { "" }
+ if$
+}
+
+FUNCTION {is.num}
+{ chr.to.int$
+ duplicate$ "0" chr.to.int$ < not
+ swap$ "9" chr.to.int$ > not and
+}
+
+FUNCTION {extract.num}
+{ duplicate$ 't :=
+ "" 's :=
+ { t empty$ not }
+ { t #1 #1 substring$
+ t #2 global.max$ substring$ 't :=
+ duplicate$ is.num
+ { s swap$ * 's := }
+ { pop$ "" 't := }
+ if$
+ }
+ while$
+ s empty$
+ 'skip$
+ { pop$ s }
+ if$
+}
+
+FUNCTION {convert.edition}
+{ edition extract.num "l" change.case$ 's :=
+ s "first" = s "1" = or
+ { bbl.first 't := }
+ { s "second" = s "2" = or
+ { bbl.second 't := }
+ { s "third" = s "3" = or
+ { bbl.third 't := }
+ { s "fourth" = s "4" = or
+ { bbl.fourth 't := }
+ { s "fifth" = s "5" = or
+ { bbl.fifth 't := }
+ { s #1 #1 substring$ is.num
+ { s bbl.th * 't := }
+ { edition 't := }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ t
+}
+
+FUNCTION {format.edition}
+{ edition empty$
+ { "" }
+ { output.state mid.sentence =
+ { convert.edition "l" change.case$ "~" * bbl.edition * }
+ { convert.edition "t" change.case$ "~" * bbl.edition * }
+ if$
+ }
+ if$
+}
+
+INTEGERS { multiresult }
+
+FUNCTION {multi.page.check}
+{ 't :=
+ #0 'multiresult :=
+ { multiresult not
+ t empty$ not
+ and
+ }
+ { t #1 #1 substring$
+ duplicate$ "-" =
+ swap$ duplicate$ "," =
+ swap$ "+" =
+ or or
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
+ if$
+ }
+ while$
+ multiresult
+}
+
+FUNCTION {format.pages}
+{ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.pages pages n.dashify tie.or.space.connect }
+ { bbl.page pages tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.vol.num.pages}
+{ volume field.or.null
+ number empty$
+ 'skip$
+ {
+ "(" number * ")" * *
+ volume empty$
+ { "there's a number but no volume in " cite$ * warning$ }
+ 'skip$
+ if$
+ }
+ if$
+ pages empty$
+ 'skip$
+ { duplicate$ empty$
+ { pop$ format.pages }
+ { ", " * format.pages * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+ 'format.pages
+ { type empty$
+ { bbl.chapter }
+ { type "l" change.case$ }
+ if$
+ chapter tie.or.space.connect
+ pages empty$
+ 'skip$
+ { ", " * format.pages * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.in.ed.booktitle}
+{ booktitle empty$
+ { "" }
+ { editor empty$
+ { word.in booktitle emphasize * }
+ { word.in booktitle emphasize *
+ " (" *
+ editor num.names$ #1 >
+ { bbl.editors }
+ { bbl.editor }
+ if$
+ capitalize
+ * " " *
+ format.in.editors *
+ ")" *
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+ month empty$ year empty$ note empty$
+ and and and and and
+ key empty$ not and
+ { "all relevant fields are empty in " cite$ * warning$ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.thesis.type}
+{ type empty$
+ 'skip$
+ { pop$
+ type "t" change.case$
+ }
+ if$
+}
+
+FUNCTION {format.tr.number}
+{ type empty$
+ { bbl.techrep }
+ 'type
+ if$
+ number empty$
+ { "t" change.case$ }
+ { number tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.article.crossref}
+{
+ key empty$
+ { journal empty$
+ { "need key or journal for " cite$ * " to crossref " * crossref *
+ warning$
+ ""
+ }
+ { word.in journal emphasize * }
+ if$
+ }
+ { word.in key * " " *}
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+FUNCTION {format.crossref.editor}
+{ editor #1 "{vv~}{ll}" format.name$
+ editor num.names$ duplicate$
+ #2 >
+ { pop$ " et~al." * }
+ { #2 <
+ 'skip$
+ { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { " et~al." * }
+ { bbl.and space.word * editor #2 "{vv~}{ll}" format.name$ * }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.book.crossref}
+{ volume empty$
+ { "empty volume in " cite$ * "'s crossref of " * crossref * warning$
+ word.in
+ }
+ { bbl.volume volume tie.or.space.connect
+ bbl.of space.word *
+ }
+ if$
+ editor empty$
+ editor field.or.null author field.or.null =
+ or
+ { key empty$
+ { series empty$
+ { "need editor, key, or series for " cite$ * " to crossref " *
+ crossref * warning$
+ "" *
+ }
+ { series emphasize * }
+ if$
+ }
+ { key * }
+ if$
+ }
+ { format.crossref.editor * }
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+FUNCTION {format.incoll.inproc.crossref}
+{
+ editor empty$
+ editor field.or.null author field.or.null =
+ or
+ { key empty$
+ { booktitle empty$
+ { "need editor, key, or booktitle for " cite$ * " to crossref " *
+ crossref * warning$
+ ""
+ }
+ { word.in booktitle emphasize * }
+ if$
+ }
+ { word.in key * " " *}
+ if$
+ }
+ { word.in format.crossref.editor * " " *}
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+FUNCTION {article}
+{ output.bibitem
+ format.authors "author" output.check
+ author add.colon
+ format.title "title" output.check
+ crossref missing$
+ { journal emphasize "journal" output.check
+ format.vol.num.pages output
+ format.date "year" output.check
+ }
+ { format.article.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ note output
+ fin.entry
+}
+
+FUNCTION {book}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check
+ editor add.colon
+ }
+ { format.authors output.nonnull
+ author add.colon
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ format.btitle "title" output.check
+ crossref missing$
+ { format.bvolume output
+ format.number.series output
+ publisher "publisher" output.check
+ address output
+ }
+ {
+ format.book.crossref output.nonnull
+ }
+ if$
+ format.edition output
+ format.date "year" output.check
+ note output
+ fin.entry
+}
+
+FUNCTION {booklet}
+{ output.bibitem
+ format.authors output
+ author add.colon
+ format.title "title" output.check
+ howpublished output
+ address output
+ format.date output
+ note output
+ fin.entry
+}
+
+FUNCTION {inbook}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check
+ editor add.colon
+ }
+ { format.authors output.nonnull
+ author add.colon
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ format.btitle "title" output.check
+ crossref missing$
+ { format.bvolume output
+ format.chapter.pages "chapter and pages" output.check
+ format.number.series output
+ publisher "publisher" output.check
+ address output
+ }
+ {
+ format.chapter.pages "chapter and pages" output.check
+ format.book.crossref output.nonnull
+ }
+ if$
+ format.edition output
+ format.date "year" output.check
+ note output
+ fin.entry
+}
+
+FUNCTION {incollection}
+{ output.bibitem
+ format.authors "author" output.check
+ author add.colon
+ format.title "title" output.check
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.bvolume output
+ format.number.series output
+ format.chapter.pages output
+ publisher "publisher" output.check
+ address output
+ format.edition output
+ format.date "year" output.check
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.chapter.pages output
+ }
+ if$
+ note output
+ fin.entry
+}
+
+FUNCTION {inproceedings}
+{ output.bibitem
+ format.authors "author" output.check
+ author add.colon
+ format.title "title" output.check
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.bvolume output
+ format.number.series output
+ format.pages output
+ address empty$
+ { organization publisher new.sentence.checkb
+ organization output
+ publisher output
+ format.date "year" output.check
+ }
+ { address output.nonnull
+ format.date "year" output.check
+ organization output
+ publisher output
+ }
+ if$
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ note output
+ fin.entry
+}
+
+FUNCTION {conference} { inproceedings }
+
+FUNCTION {manual}
+{ output.bibitem
+ author empty$
+ { organization empty$
+ 'skip$
+ { organization output.nonnull
+ address output
+ }
+ if$
+ }
+ { format.authors output.nonnull }
+ if$
+ author add.colon
+ format.btitle "title" output.check
+ author empty$
+ { organization empty$
+ {
+ address output
+ }
+ 'skip$
+ if$
+ }
+ {
+ organization output
+ address output
+ }
+ if$
+ format.edition output
+ format.date output
+ note output
+ fin.entry
+}
+
+FUNCTION {mastersthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ author add.colon
+ format.btitle "title" output.check
+ bbl.mthesis format.thesis.type output.nonnull
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ note output
+ fin.entry
+}
+
+FUNCTION {misc}
+{ output.bibitem
+ format.authors output
+ author add.colon
+ format.title output
+ howpublished output
+ format.date output
+ note output
+ fin.entry
+}
+
+FUNCTION {online}
+{ output.bibitem
+ format.authors output
+ author add.colon
+ format.title output
+ format.date output
+ address output
+ format.url output
+ format.urldate output
+ note output
+ fin.entry
+}
+
+FUNCTION {ctan}
+{ output.bibitem
+ format.authors output
+ author add.colon
+ format.title output
+ format.date output
+ format.ctanurl output
+ format.urldate output
+ note output
+ fin.entry
+}
+
+FUNCTION {phdthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ author add.colon
+ format.btitle "title" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ note output
+ fin.entry
+}
+
+FUNCTION {proceedings}
+{ output.bibitem
+ editor empty$
+ { organization output }
+ { format.editors output.nonnull }
+ if$
+ editor add.colon
+ format.btitle "title" output.check
+ format.bvolume output
+ format.number.series output
+ address empty$
+ { editor empty$
+ { publisher new.sentence.checka }
+ { organization publisher new.sentence.checkb
+ organization output
+ }
+ if$
+ publisher output
+ format.date "year" output.check
+ }
+ { address output.nonnull
+ format.date "year" output.check
+ editor empty$
+ 'skip$
+ { organization output }
+ if$
+ publisher output
+ }
+ if$
+ note output
+ fin.entry
+}
+
+FUNCTION {techreport}
+{ output.bibitem
+ format.authors "author" output.check
+ author add.colon
+ format.title "title" output.check
+ format.tr.number output.nonnull
+ institution "institution" output.check
+ address output
+ format.date "year" output.check
+ note output
+ fin.entry
+}
+
+FUNCTION {unpublished}
+{ output.bibitem
+ format.authors "author" output.check
+ author add.colon
+ format.title "title" output.check
+ note "note" output.check
+ fin.entry
+}
+
+FUNCTION {default.type} { misc }
+
+READ
+
+FUNCTION {sortify}
+{ purify$
+ "l" change.case$
+}
+
+INTEGERS { len }
+
+FUNCTION {chop.word}
+{ 's :=
+ 'len :=
+ s #1 len substring$ =
+ { s len #1 + global.max$ substring$ }
+ 's
+ if$
+}
+
+FUNCTION {sort.format.names}
+{ 's :=
+ #1 'nameptr :=
+ ""
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ { s nameptr
+ "{ll{ }}{ ff{ }}{ jj{ }}"
+ format.name$ 't :=
+ nameptr #1 >
+ {
+ nameptr #3 =
+ numnames #3 > and
+ { "others" 't :=
+ #1 'namesleft := }
+ 'skip$
+ if$
+ " " *
+ namesleft #1 = t "others" = and
+ { "aaaaa" * }
+ { t sortify * }
+ if$
+ }
+ { t sortify * }
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {sort.format.title}
+{ 't :=
+ "A " #2
+ "An " #3
+ "The " #4 t chop.word
+ chop.word
+ chop.word
+ sortify
+ #1 global.max$ substring$
+}
+
+FUNCTION {author.sort}
+{ author empty$
+ { key empty$
+ { "to sort, need author or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { author sort.format.names }
+ if$
+}
+
+FUNCTION {author.editor.sort}
+{ author empty$
+ { editor empty$
+ { key empty$
+ { "to sort, need author, editor, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { editor sort.format.names }
+ if$
+ }
+ { author sort.format.names }
+ if$
+}
+
+FUNCTION {author.organization.sort}
+{ author empty$
+ { organization empty$
+ { key empty$
+ { "to sort, need author, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
+ if$
+ }
+ { author sort.format.names }
+ if$
+}
+
+FUNCTION {editor.organization.sort}
+{ editor empty$
+ { organization empty$
+ { key empty$
+ { "to sort, need editor, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
+ if$
+ }
+ { editor sort.format.names }
+ if$
+}
+
+FUNCTION {presort}
+{ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.sort
+ { type$ "proceedings" =
+ 'editor.organization.sort
+ { type$ "manual" =
+ 'author.organization.sort
+ 'author.sort
+ if$
+ }
+ if$
+ }
+ if$
+ " "
+ *
+ year field.or.null sortify
+ *
+ " "
+ *
+ title field.or.null
+ sort.format.title
+ *
+ #1 entry.max$ substring$
+ 'sort.key$ :=
+}
+
+ITERATE {presort}
+
+SORT
+
+STRINGS { longest.label }
+
+INTEGERS { number.label longest.label.width }
+
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+ #1 'number.label :=
+ #0 'longest.label.width :=
+}
+
+FUNCTION {longest.label.pass}
+{ number.label int.to.str$ 'label :=
+ number.label #1 + 'number.label :=
+ label width$ longest.label.width >
+ { label 'longest.label :=
+ label width$ 'longest.label.width :=
+ }
+ 'skip$
+ if$
+}
+
+EXECUTE {initialize.longest.label}
+
+ITERATE {longest.label.pass}
+
+FUNCTION {begin.bib}
+{ preamble$ empty$
+ 'skip$
+ { preamble$ write$ newline$ }
+ if$
+ "\begin{thebibliography}{" longest.label * "}" *
+ write$ newline$
+}
+
+EXECUTE {begin.bib}
+
+EXECUTE {init.state.consts}
+
+ITERATE {call.type$}
+
+FUNCTION {end.bib}
+{ newline$
+ "\end{thebibliography}" write$ newline$
+}
+
+EXECUTE {end.bib}
+%% End of customized bst file
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex
index a3e573b0e7a..4a656a85663 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news09.tex 856 2013-12-09 10:34:40Z herbert $
+%% $Id: pst-news09.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
index 42fad6b79bb..e338a162ab3 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news10.tex 755 2013-03-09 08:48:58Z herbert $
+%% $Id: pst-news10.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
index 60450ca6186..a4254f226f4 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news11.tex 755 2013-03-09 08:48:58Z herbert $
+%% $Id: pst-news11.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
index 1a86e1381bb..dc9aeca3c00 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news12.tex 755 2013-03-09 08:48:58Z herbert $
+%% $Id: pst-news12.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
index 3b265a5946a..2995cf042d8 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news13.tex 856 2013-12-09 10:34:40Z herbert $
+%% $Id: pst-news13.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
index 64d7d2dada2..75b209b580a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news13.tex 856 2013-12-09 10:34:40Z herbert $
+%% $Id: pst-news14.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
index e661e3eb9c0..00eee7d6b6b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
index 0831398d4f9..dbe7d6a6c81 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
@@ -30,13 +30,22 @@ basic package \nxLFile{pstricks}}
\part{\texttt{pstricks} -- package}
%--------------------------------------------------------------------------------------
-%\section{\texttt{pstricks.sty}}
+\section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}}
%--------------------------------------------------------------------------------------
-
+The code for an automatic loading of package \LPack{auto-pst-pdf} is now moved
+into an own package \LPack{pstricks-pdf}. It allows to run PSTricks code with \Lprog{pdflatex} \texttt{-{}-shell-escape <file>}.
+The option \Loption{pdf} for \LPack{pstricks} itself is now obsolet.
%--------------------------------------------------------------------------------------
\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
%--------------------------------------------------------------------------------------
+
+PSTricks now takes the optional argument \Loption{draft} of the main document class
+into account. It shows only a frame, given by the coordinates of the \Lenv{pspicture}
+environment.
+
+
+
\subsection{PostScript code}
Additionally to the macro \Lcs{pstVerb} there are now the keywords
\Lkeyword{precode} and \Lkeyword{postscode} which can be used by other
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
new file mode 100644
index 00000000000..8bd09389cc7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
@@ -0,0 +1,4 @@
+some nonsense in this line ---time forcex forcey
+0 0.2
+1 1
+2 4
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
index 03151d0817b..59c3e6e1e52 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
@@ -1,4 +1,4 @@
-% $Id: distiller.cfg 177 2015-09-11 09:15:16Z herbert $
+% $Id: distiller.cfg 183 2015-09-14 20:10:17Z herbert $
%% BEGIN: distiller.con (for distiller driver)
%%
%% Configuration file for PSTricks
@@ -18,6 +18,7 @@
\def\pstunit{1bp}%
\def\pstVerb#1{\special{ps: #1}}
\def\pstverbscale{SDict begin normalscale end}
+\def\pstnodescale{}% not needed for pdftex
\ifx\textsuperscript\@undefined
\def\pstheader#1{\special{header=#1}}
\else
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
index b72e765dd10..d28f1f7ea5d 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
@@ -1,9 +1,9 @@
-% $Id: dvipsone.cfg 177 2015-09-11 09:15:16Z herbert $
+% $Id: dvipsone.cfg 180 2015-09-11 12:10:43Z herbert $
%% BEGIN pstricks.con (for DVIPSONE driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
%%
-%% Version 97 (1994/03/29)
+%% Version 0.01 (2015/09/11)
%%
%% For use with DVIPSONE. (May require the -j flag with dvipsone)
@@ -12,6 +12,7 @@
{\catcode`\"=12 \gdef\pstverb#1{\special{" #1}} }
\def\pstVerb#1{\special{ps:: #1}}
\def\pstverbscale{1 dviscl div dup neg scale}
+\def\pstnodescale{}
\def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}
\def\pstheader#1{\special{header=#1}}
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
index 774f0073fa8..d9ffb042956 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
@@ -1,4 +1,4 @@
-% $Id: gastex.cfg 177 2015-09-11 09:15:16Z herbert $
+% $Id: gastex.cfg 183 2015-09-14 20:10:17Z herbert $
%% BEGIN: pstricks.con (for xdvipdfmx driver)
%%
%% Configuration file for PSTricks
@@ -10,6 +10,7 @@
%% This file may be distributed, used and modified freely.
%
\def\pstdriver{xdvipdfmx}%
+\def\pstnodescale{}
\ifx\textsuperscript\@undefined
\def\pstheader#1{\special{header=#1}}%
\else
@@ -19,6 +20,7 @@
\let\pstheader\Gin@PS@file@header%
\fi
\fi
+\def\pstnodescale{}% not needed for pdftex
%%%%%%%%%%%%%%%%%%% !! CUSTOMIZATION STUFF GOES HERE: !! %%%%%%%%%%%%%%%%%%
%% If you want to include your own customizations to pstricks.tex, then
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
index 518365368ab..588cc6591c6 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
@@ -1,4 +1,4 @@
-% $Id: textures.cfg 177 2015-09-11 09:15:16Z herbert $
+% $Id: textures.cfg 183 2015-09-14 20:10:17Z herbert $
%% BEGIN pstricks.con (for Textures 1.7 and 1.8 driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
@@ -13,6 +13,7 @@
\def\pstverb#1{\special{postscript #1 }}
\def\pstVerb#1{\special{rawpostscript #1}}
\def\pstverbscale{Mag 72.27 72 div mul dup neg scale}
+\def\pstnodescale{}% not needed for pdftex
\def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}
\def\pstheader#1{\special{prePostScriptfile #1}}%
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
index 6baa3fe0238..7205579c208 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
@@ -1,4 +1,4 @@
-% $Id: vtex.cfg 177 2015-09-11 09:15:16Z herbert $
+% $Id: vtex.cfg 183 2015-09-14 20:10:17Z herbert $
%% BEGIN: pstricks.con (for VTeX)
%%
%% Configuration file for PSTricks 97
@@ -21,6 +21,7 @@
\def\pstunit{1bp}%
\def\pstVerb#1{\special{pS: #1}}%
\def\pstverbscale{SDict begin normalscale end}
+\def\pstnodescale{}% not needed for pdftex
\ifx\textsuperscript\@undefined
\def\pstheader#1{\special{header=#1}}
\else
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
index 8345020656f..b2a7e982466 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
@@ -1,5 +1,5 @@
-% $Id: xdvipdfmx.cfg 179 2015-09-11 09:58:42Z herbert $
-
+% $Id: xdvipdfmx.cfg 180 2015-09-11 12:10:43Z herbert $
+%
%% BEGIN: pstricks.con (for xdvipdfmx driver)
%%
%% Configuration file for PSTricks
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 7d9911402ca..447da532c3a 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,7 +1,7 @@
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2015 Herbert Voss
+%% Copyright 2004-2016 Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -116,8 +116,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.63}
-\def\filedate{2015/09/11}
+\def\fileversion{2.64a}
+\def\filedate{2015/11/11}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -4086,7 +4086,7 @@ pop
}
\def\psput@special#1{%
\hbox{%
- \pst@Verb{{ \pst@coor \pstnodescale } \tx@PutCoor \tx@PutBegin }%
+ \pst@Verb{{ \pst@coor \pstnodescale } \tx@PutCoor \tx@PutBegin }% 20150911 hv
\box#1%
\pst@Verb{ \tx@PutEnd }%
}%
@@ -4373,8 +4373,8 @@ pop
\pst@dimb=\pst@dimd%
\pst@dimd=\pst@dimg%
\fi%
- \setbox\pst@hbox=\hbox\bgroup%
- \begingroup\KillGlue%
+ \setbox\pst@hbox=\hbox\bgroup
+ \begingroup\KillGlue
\@ifundefined{@latexerr}{}{\let\unitlength\psunit}%
\edef\pic@coor{(#2,#3)(#2,#3)(#4,#5)}%
% ----------- 1.10/12 beg hv -------------------
@@ -4417,11 +4417,13 @@ pop
\pst@dimd=0.5\pst@dimd
\else\pst@dimd-\pst@shift\fi
\advance\pst@dimd\pst@dimb
- \lower\pst@dimd%
- \box\pst@hbox%
+ \lower\pst@dimd
+ \box\pst@hbox
\kern\pst@dimc}%
- \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi%
- \leavevmode\box\pst@hbox%
+ \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi
+ \leavevmode\ifdim\overfullrule=\z@\box\pst@hbox\else
+ \fboxsep=0pt
+ \fbox{\rule[-\pst@shift]{0pt}{\ht\pst@hbox}\rule{\wd\pst@hbox}{0pt}}\fi
\endgroup%
\psset[pstricks]{shift=0}% reset value
}
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index fe4e58f029e..8b3df60d05b 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -23,12 +23,16 @@
DIV13]{scrartcl}
%
\RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor}
-\RequirePackage[T1]{fontenc}
+\RequirePackage{ifxetex}
+\ifxetex
+\else
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage{textcomp}
+ %\RequirePackage[euler-digits]{eulervm}
+ \RequirePackage{bera}
+ %\RequirePackage[scaled=0.85]{luximono}
+\fi
\RequirePackage{ifpdf}
-\RequirePackage{textcomp}
-%\RequirePackage[euler-digits]{eulervm}
-\RequirePackage{bera}
-%\RequirePackage[scaled=0.85]{luximono}
% Define commands that don't eat spaces.
\RequirePackage{xspace}
\makeatletter
@@ -261,13 +265,13 @@ xleftmargin=0pt,xrightmargin=0pt,
% Inhalte von List of Figures
\IfPackageLoaded{subfig}{\setcounter{lofdepth}{1} %1 = nur figures, 2 = figures + subfigures
}
-\RequirePackage[colorlinks=true,
+\RequirePackage[colorlinks,
urlcolor=pdfurlcolor,
filecolor=pdffilecolor,
linkcolor=pdflinkcolor,
breaklinks,
linktocpage=true]{hyperref}
-\ifpdf
+\ifxetex
\else
\RequirePackage{breakurl}
\fi
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
new file mode 100644
index 00000000000..e3907c28d7e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
@@ -0,0 +1,28 @@
+%%
+%% This is file `pstricks-pdf.sty'.
+%%
+%% IMPORTANT NOTICE:
+%%
+%% pstricks-pdf.sty Copyright (C) 2016 Herbert Voss <hvoss@tug.org>
+%%
+%% This package may be distributed under the terms of the LaTeX Project
+%% Public License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+
+\ProvidesPackage{pstricks-pdf}[2015/11/11 v0.01 wrapper for `pstricks.sty' (HV)]
+%
+\DeclareOption*{%
+ \PassOptionsToPackage\CurrentOption{auto-pst-pdf}%
+ \PassOptionsToPackage\CurrentOption{pstricks}}%
+\ProcessOptions\relax
+%
+\RequirePackage{auto-pst-pdf}%
+\def\app@pdfcrop@opts{--hres}%%% hv 20130405
+\@ifclassloaded{beamer}{\ifpdf\else\setbeamertemplate{navigation symbols}\fi}{}%
+\RequirePackage{pstricks}
+%
+%%
+%% End of file `pstricks-pdf.sty'.
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index d34dd775288..195e12d54bf 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -5,7 +5,7 @@
%%
%% pstricks.sty Copyright (C) 1997 Timothy Van Zandt
%% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle
-%% pstricks.sty Copyright (C) 2004-2014 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% pstricks.sty Copyright (C) 2004-2016 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%% Herbert Voss <hvoss@tug.org>
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -15,7 +15,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pstricks}[2013/12/12 v0.60 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2015/11/11 v0.61 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -32,128 +32,38 @@
\fi
}
%
-\newif\ifpst@OldVersion\pst@OldVersionfalse
-\DeclareOption{97}{\pst@OldVersiontrue}
-%
-\newif\ifpst@ovl \pst@ovlfalse
-\DeclareOption{overlays}{\global\pst@ovltrue}
+\def\pst@ColorPackage{xcolor}
+\DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
%
-\newif\ifpst@loadPDF \pst@loadPDFfalse
-\DeclareOption{pdf}{\global\pst@loadPDFtrue}
-%------------------------------------ PLAIN --------------------------------
+%---------------------------------DISTILLER --------------------------------
+\newif\ifpst@distiller\pst@distillerfalse
+\DeclareOption{distiller}{\pst@distillertrue}
-\DeclareOption{plain}{%
- \ifpst@OldVersion
- \def\psDEBUG[#1]#2{}%
- \def\pst@tempa{pstricks97.tex}%
- \else
- \def\pst@tempa{pstricks.tex}%
- \fi
- \input{\pst@tempa}%
- \ProvidesFile{\pst@tempa}[\filedate\space v\fileversion\space `PSTricks' (tvz)]%
- \endinput
-}
-%
-\DeclareOption*{\OptionNotUsed}
-%
+%---------------------------------COLOR --------------------------------
+\DeclareOption{monochrome}{%
+ \AtBeginDocument{\special{ps:
+ /setrgbcolor { add add 0 gt {1}{0} ifelse setgray } def
+ /setcmykcolor{ 4 dict begin
+ /k ED /y ED /m ED /c ED
+ 1 1 k sub c mul k add sub 0.29 mul
+ 1 1 k sub m mul k add sub 0.587 mul add
+ 1 1 k sub y mul k add sub 0.114 mul add
+ end 0 gt {1}{0} ifelse setgray } def }}}
+
+\DeclareOption{grayscale}{%
+ \AtBeginDocument{\special{ps:
+ /setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def
+ /setcmykcolor{ 4 dict begin
+ /k ED /y ED /m ED /c ED
+ 1 1 k sub c mul k add sub 0.29 mul
+ 1 1 k sub m mul k add sub 0.587 mul add
+ 1 1 k sub y mul k add sub 0.114 mul add
+ end setgray } def }}}
+
+\DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
\ProcessOptions\relax
-%
-\RequirePackage{ifpdf}
-%
-\ifpst@loadPDF
- \ifnum\pdfshellescape=\@ne\else
- \PackageWarningNoLine{pstricks}{%
-************************************ \MessageBreak
- Option pdf needs a "pdflatex -shell-escape <file>" \MessageBreak
- or a "pdflatex -enable-write18 <file>" \MessageBreak
- (if you are using MikTeX) \MessageBreak
-************************************}
- \fi
- \def\app@pdfcrop@opts{--hres}%%% hv 20130405
- \@ifclassloaded{beamer}{%
- \ifpdf \else\setbeamertemplate{navigation symbols}{} \fi
- \AtEndOfPackage{\RequirePackage{auto-pst-pdf}}}
- {\AtBeginDocument{%
- {\@ifundefined{shorthandoff} % we have no babel until now
- { \typeout{noshorthand}\usepackage{auto-pst-pdf}}
- { \@ifundefined{bbl@active@"}{}{\shorthandoff{"}}
- \usepackage{auto-pst-pdf}
- \@ifundefined{bbl@active@"}{}{\shorthandon{"}}}}}}
-\fi
-%
-\ifpst@ovl \RequirePackage{pst-ovl}\fi
-%
-\@ifundefined{PSTricksLoaded}
-{%
- \let\saved@scalebox\scalebox
- \ifpst@OldVersion
- \def\psDEBUG[#1]#2{}
- \def\pst@tempa{pstricks97.tex}%
- \else
- \def\pst@tempa{pstricks.tex}
- \fi
- \input{\pst@tempa}%
- \ProvidesFile{\pst@tempa}
- [\filedate\space v\fileversion\space `PSTricks' (tvz,hv)]
- \ifpst@OldVersion
- \IfFileExists{pstricks97.pro}{%
- \ProvidesFile{pstricks97.pro}%
- [1998/06/01 v. 97 patch 3, PostScript prologue file (hv)]
- \@addtofilelist{pstricks97.pro}}{}%
- \IfFileExists{pst-dots97.pro}{%
- \ProvidesFile{pst-dots97.pro}
- [1999/12/16 v. 97 patch 1, PostScript prologue file (hv)]
- \@addtofilelist{pst-dots97.pro}}{}%
- \else
- \input{pst-fp.tex}
- \ProvidesFile{pst-fp.tex}
- [\filedate\space v\fileversion\space `PST-fp' (hv)]
- \IfFileExists{pstricks.pro}{%
- \ProvidesFile{pstricks.pro}
- [2012/10/16 v. 1.15, PostScript prologue file (hv)]
- \@addtofilelist{pstricks.pro}}{}%
- \IfFileExists{pst-algparser.pro}{%
- \ProvidesFile{pst-algparser.pro}
- [2011/10/31 v. 0.04, PostScript prologue file (hv)]
- \@addtofilelist{pst-algparser.pro}}{}%
- \IfFileExists{pst-tools.pro}{%
- \ProvidesFile{pst-tools.pro}
- [2012/01/01 v. 0.02, PostScript prologue file (hv)]
- \@addtofilelist{pst-tools.pro}}{}%
- \IfFileExists{pst-dots.pro}{%
- \ProvidesFile{pst-dots.pro}
- [2006/12/19 v. 2.00, PostScript prologue file (hv)]
- \@addtofilelist{pst-dots.pro}}{}%
- \fi
- {%
- \let\psscalebox\scalebox
- \let\psscaleboxto\scaleboxto
- }{}
- \let\scalebox\saved@scalebox
-}{}
-%
-%
-\IfFileExists{xcolor.sty}{%
- \def\pst@ColorPackage{xcolor}
-% \PassOptionsToPackage{override}{xcolor}
-}{\def\pst@ColorPackage{color}}%
-%------------------------------------ DIA --------------------------------
-\newif\ifpst@DIA\pst@DIAfalse
-\DeclareOption{DIA}{\pst@DIAtrue}
-%------------------------------ color or xcolor --------------------------
-\DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
-%------------------------------------ VTeX --------------------------------
-\DeclareOption{vtex}{%
- \pst@def{setTransparency}< >
- \pst@def{setStrokeTransparency}< >
- \pst@def{setBlendmode}< >%
- \PassOptionsToPackage{vtex}{\pst@ColorPackage}%
-}
-%---------------------------------DISTILLER --------------------------------
-\newif\ifpst@distiller\pst@distillerfalse
-\DeclareOption{distiller}{%
- \pst@distillertrue%
+\ifpst@distiller
\pst@def{setTransparency}<
[ /ca \psk@opacityalpha
/CA \psk@opacityalpha /SetTransparency pdfmark >
@@ -180,34 +90,32 @@
/Luminosity % 15
\else /Normal \fi
/ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >%
-}
-%---------------------------------COLOR --------------------------------
-\DeclareOption{monochrome}{%
- \AtBeginDocument{\special{ps:
- /setrgbcolor { add add 0 gt {1}{0} ifelse setgray } def
- /setcmykcolor{ 4 dict begin
- /k ED /y ED /m ED /c ED
- 1 1 k sub c mul k add sub 0.29 mul
- 1 1 k sub m mul k add sub 0.587 mul add
- 1 1 k sub y mul k add sub 0.114 mul add
- end 0 gt {1}{0} ifelse setgray } def }}}
-
-\DeclareOption{grayscale}{%
- \AtBeginDocument{\special{ps:
- /setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def
- /setcmykcolor{ 4 dict begin
- /k ED /y ED /m ED /c ED
- 1 1 k sub c mul k add sub 0.29 mul
- 1 1 k sub m mul k add sub 0.587 mul add
- 1 1 k sub y mul k add sub 0.114 mul add
- end setgray } def }}}
-
-\DeclareOption*{%
- \PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
-\ProcessOptions\relax
-
+\fi
+%
\RequirePackage{\pst@ColorPackage}
-
+%
+\@ifundefined{PSTricksLoaded}
+{%
+ \let\saved@scalebox\scalebox
+ \input{pstricks}%
+ \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)]
+ \input{pst-fp.tex}
+ \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)]
+ \IfFileExists{pstricks.pro}{%
+ \ProvidesFile{pstricks.pro}
+ [2012/10/16 v. 1.15, PostScript prologue file (hv)]
+ \@addtofilelist{pstricks.pro}}{}%
+ \IfFileExists{pst-algparser.pro}{%
+ \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04, PostScript prologue file (hv)]
+ \@addtofilelist{pst-algparser.pro}}{}%
+ \IfFileExists{pst-tools.pro}{%
+ \ProvidesFile{pst-tools.pro}[2012/01/01 v. 0.02, PostScript prologue file (hv)]
+ \@addtofilelist{pst-tools.pro}}{}%
+ \IfFileExists{pst-dots.pro}{%
+ \ProvidesFile{pst-dots.pro}[2006/12/19 v. 2.00, PostScript prologue file (hv)]
+ \@addtofilelist{pst-dots.pro}}{}%
+}{}
+%
\@ifpackageloaded{xcolor}{%
\@ifpackagelater{xcolor}{2004/05/02}%
{%
@@ -299,6 +207,4 @@
% LaTeX used `\color@endgroup' instead. RN 2004-05-06
}
%
-\endinput
-%%
%% End of file `pstricks.sty'.