diff options
| author | Norbert Preining <norbert@preining.info> | 2021-09-11 03:02:10 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2021-09-11 03:02:10 +0000 |
| commit | bbb409a0db8bab4e45fd1fa3e7f269a855296bbc (patch) | |
| tree | 61202f318d33af2c24a47451e8b13278d1e904b3 /graphics/pstricks | |
| parent | 4e370b2ebab8272a89ed81ba95cf068ef2b07ef0 (diff) | |
CTAN sync 202109110302
Diffstat (limited to 'graphics/pstricks')
53 files changed, 1050 insertions, 2694 deletions
diff --git a/graphics/pstricks/base/Changes b/graphics/pstricks/base/Changes index fc78f86512..e1104a5330 100644 --- a/graphics/pstricks/base/Changes +++ b/graphics/pstricks/base/Changes @@ -1,4 +1,7 @@ -% $Id: Changes 191 2021-09-05 20:07:31Z herbert $ +% $Id: Changes 212 2021-09-10 09:21:06Z herbert $ + +For all changes see file History! Here are only the last one changes +listed. Changelog for @@ -14,8 +17,6 @@ pstricks97.pro ------- pstricks-pdf.sty ----- pstricks.sty --------- pst-all.sty --------- -%pstricks-pdf.sty ----- -%pst-platform.sty ---- -------------------------------------------------------------------------- @@ -25,6 +26,8 @@ pstricks.tex -------- versions like 2.47a have only changes in other files, but not in this main package. +3.08 2021-09-10 - moved the color stuff into a separate file pstricks-colors + - added macros to get the color values without the color model name 3.07 2021-09-05 - fix for vee arrows in pstricks-arrows - with optional argument "gsfonts" for PSTricks, one can use GS fonts from URW, like StandardSymL, NimbusRomNo9L-Regu, @@ -45,257 +48,7 @@ in this main package. of GhostScript's StandardSymL->s050000l.pfb 3.02 2021-05-31 - added arrow type T<->T, similar to TikZ 3.01a 2021-03-30 - fix bug for intro to Ghostscript >9.52 in pstricks.pro -3.01 2020-09-18 - make it compatible to Ghostscript >9.52 for strokeopacity -3.00 2020-06-11 - added package pstricks-pdf for using auto-pst-pdf -2.99 2020-06-09 - added two optional arguments for \psgrid: griddx and griddy -2.97 2019-05-11 - fix for trailing space with \pscustom -2.96 2019-02-23 - use \ifx\pgfkeysloaded\relax for the test -2.95 2019-01-22 - preset dimen=inner for a circle -2.94 2019-01-07 - added \psLine which can have only one or two pair of - coordinates which are tested for a distance zero -2.93 2019-01-07 - fix for changes in pgffor.code.tex -2.92 2018-12-24 - revert chnages for \psarc (don't work for nodes as angle) -2.91 2018-12-24 - bugfix for identical angles and \psellipticatc(n) -2.90a 2018-12-22 - added optional argument xetex for pstricks.sty -2.90 2018-12-17 - undocumented feature for x|y-offset of gridlabels -2.89 2018-12-16 - allow keysetting for \rput only for valid options -2.88 2018-12-13 - fix an introduced trailing space -2.87 2018-12-11 - allow key/value setting for \rput[key=vale,...](...) -2.86a 2018-11-14 - fix for latext Ghostscript, added PS function Power - which can be used instead of exp -2.86 2018-08-23 - fix for trailing space in showgrid (#1f) -2.85 2018-08-22 - fix for trailing space in \radians -2.84 2018-05-01 - use \long\def\@fornoop from recent LaTeX -2.83a 2018-02-08 - changes in pstricks.sty -2.82 2018-01-06 - allow ! notation in \psRing for the two radii -2.81 2018-01-01 - disable engine check (defined in pstricks.sty) -2.80a 2017-12-30 - added some PS functions for conversion of angles -2.80 2017-12-08 - fix for \radians -2.79 2017-11-27 - fix rounding error in \pscircle for a big linewidth -2.78 2017-11-26 - fix for a trailing space in oefill -2.77 2017-10-04 - fix bug with wrong position for catcode change of @ - (debian bug 877682) - - created new file pstricks-tex.def for the additional - latex macros when running tex - - define \ifpst@psfonts for the TeX part -2.76a 2017-09-23 - revert the changes for PtoC: PtoC360->PtoC (old meaning) - PtoC->PtoCrel (relativ) -2.76 2017-09-17 - use an optional argument to switch between - original PostScript or URW fonts (Nimbus) - default is URW -2.75a 2017-09-12 - modifications in pstricks.pro -2.75 2017-08-24 - use always URW fonts instead of PostScript, - eg Helvetica->NimbusSanL -2.74a 2017-07-16 - modified pstricks.sty -2.74 2017-06-15 - added a randomcolor for gray, rgb, cmyk and hsb -2.73a 2017-05-22 - revert unneeded changes in pst-fp -2.73 2017-05-18 - "understandable" error message when using pdflatex - without loading auto-pst-pdf -2.72b 2017-04-19 - uploaded wrong version -2.72a 2017-04-18 - fix bug with unicode-math in pst-doc.cls -2.72 2017-04-06 - load pgf related macros only when - not done by tikz itself -2.71 2016-12-23 - added optional argument to \newpsstyle -2.70 2016-09-23 - use strokeopacity for doubleline, too -2.69 2016-09-16 - use option draft instead of overfullrule -2.68 2016-06-09 - test for \overfullrule depending to latex -2.67 2016-05-28 - fix bug for \psCirclebox@ii. depth must be negative -2.66 2016-05-19 - do the allocation stuff only for - the original TeX and not eTeX -2.65a 2016-04-22 - fix in pstricks.pro -2.65 2016-02-07 - fix bug with pst@refangle -2.64b 2015-11-14 - fix bug in pstricks.sty -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 -2.61 2015-06-28 - added optional arguments precode and postcode -2.60 2014-10-25 - make it compatible for using it with ConTeXt -2.57 2014-08-27 - take option correctAngle into account for \psellipticwedge -2.56 2014-07-31 - added gridstyleA and fixed bug with Ellipse and move - to start point -2.55 2014-07-28 - added \psellipseAB: draw an ellipse between two given points -2.54a 2014-05-19 - fixed introduced bug in pst-algparser.pro -2.54 2014-05-19 - allow circle and ellipse in \pscustom with moving - the currentpoint to the start point and not the center. -2.53a 2014-03-30 - changes in pst-algparser.pro -2.53 2014-03-12 - added cubic splines -2.52 2014-03-01 - allow rot=.. for all elliptic macros - - enable \SpecialCoor as default -2.51 2014-02-03 - make strokeopacity available for dots -2.50 2014-01-16 - added experimental fillstyle oefill, the inverse of eofill - - allow PostScript notation for \pst@checknum -2.49c 2013-12-27 - moved overlay functions into an own package -2.49b 2013-12-21 - moved overlay functions into an own dictionary -2.49a 2013-12-09 - changes in pstricks.sty -2.49 2013-12-09 - added \reversepath -2.48 2013-11-29 - fixed trailing space for !! -2.47a 2013-11-28 - changes in pst-ovl -2.47 2013-11-26 - added special coor type !! for Postfix notation - in user coordinates -2.46 2013-08-13 - fixed bug with \pstcustomize (delete a line) -2.45 2013-07-08 - moved the overlay part into pst-ovl - - added \@tfor macros if used without \LaTeX -2.44 2013-06-24 - add macros \pssetMonochrome and \pssetGrayscale - - added coor option ** for (f(y) y) -2.43 2013-05-12 - allow option ! to the labelsep of \uput -2.42 2013-04-26 - add option + for coordinates to allow - (+{x} {f(x)}) both in algebraic notation where - x must be expanded to a value. -2.41 2013-04-17 - add option for using the pgf PS functions. - in some cases they are missing. They are - defined in pst-tools.pro which is loaded - by default. -2.40 2013-04-05 - fix for showgrid=top. Uses now the - same units as showgrid=bottom - - added \psRing -2.39 2013-04-04 - fix for introduced bug for showgrid -2.38 2013-04-03 - fix for showgrid=true -2.37 2013-03-12 - fix for \uput@vii#1#2 -2.36 2013-02-09 - fix for introduced bug for pst@dotFill -2.35 2012-12-21 - fix for introduced bug with missing - definition for \@width -2.34 2012-11-18 - make package pgffor available -2.33 2012-09-23 - fix a trailing space in \pst@Pyth -2.32 2012-09-20 - added more blendmodes for distiller -2.31 2012-08-24 - fixed bug with the star version of \psellipticarc - and the additional setting of showpoints -2.30 2012-08-13 - fixed bug with the star version of \psellipticarc - - added fillstyle options eovlines, eohlines, - eovlines*, and eohlines* -2.29 2012-06-04 - fixed itroduced trailing space with boolkey -2.28 2012-05-24 - added \add@psCode, which uses \pstVerb - instead of \pstverb -2.27 2012-03-11 - activate \tx@strokeopacity for \psgrid -2.26 2012-02-19 - showgrid=top is now possible -2.25 2012-02-12 - modifications to the code of curveticks -2.24 2012-02-09 - add option for curveticks with option symbol -2.23 2011-09-04 - change also \psx|ylabelsep for pst-plot -2.22 2011-07-09 - added fillstyle dots -2.21 2011-06-07 - fix bug with a trailing space in \psForeach -2.20 2011-04-23 - load pst-tools.pro -2.19 2011-03-25 - fixed a bug with missing coordinates for pspicture -2.18 2011-02-15 - fixed a bug with correctAngle and showpoints of - \psellipticarc - - fixed introduced bug with arrowscale=... -2.17 2011-01-30 - added \psLoop for loops without a defined counter -2.16 2010-12-18 - added optional argument dashcolor and new linestyle - coloreddashed -2.15 2010-11-25 - bugfix for using \pstCheckCoorType -2.14 2010-11-14 - bugfix for using \pst@pyth. Now \pst@Pyth, which uses - no dimen registers -2.13 2010-11-01 - new macro and counter for the type of read coordinates - \pstCheckCoorType{#1} sets the macro \pst@C@@rType -% \pst@C@@rType = 0 cartesian (x,y) -% = 1 polar (r;phi) -% = 2 PS (! x y) -% = 3 mixed ((x,y)|(x,y)) -% = 4 algebraic (*x f(x)) -% = 5 node (A) -% = 6 special node ([...]A) -% = 7 node (>A) - -2.12 2010-09-16 - new optional argument for setflat - - fix bug with doubled linecap definition - - fix bug with missing linejoin in \psls@solid -2.11 2010-09-09 - new optional arguments for setting a variable - linewidth and variable color -2.10 2010-08-27 - new optional argument noCurrentPoint, which is - preset to false. -2.09 2010-07-28 - fix bug with rotation values like *0 (ms) -2.08 2010-06-06 - fix bug with uput@vii -2.07 2010-05-24 - fix bug with uput and node setting (ms) -2.06 2010-04-27 - fix bug with trailing space in \pst@isnum -2.05 2010-04-26 - fix bug with missing \psk@rot for Ellipse -2.04 2010-04-24 - take \psk@rot into account for \psellipse (hv) - - new version of \pst@divide (ms) -2.03 2010-04-12 - add keyword correctAngle=true to get an - elliptic arc with correct bow length -2.02 2010-02-23 - fix a spurious blank in \NormalCoor -2.01 2010-02-15 - fix problem with nonlinear angles for - \psellipticarc - - fix problem with tex: pst-xkey must be loaded - after we are sure having all latex macros - defined -2.00 2010-02-11 - use pst-xkey to get rid of dependencies with - other packages -1.33 2009-12-22 - add linestyle symbol -1.32 2009-12-14 - fixed bug with \hskip and fnode in psmatrix - with a new \pshspace#1 - - moved the algebraic option from pstricks-add - to the main pstricks.tex -1.31 2009-11-27 - fixed introduced problem with \pst@def -1.30 2009-10-25 - revert the changes for the \pst@object, it now - use \def\pst@par{} -1.29 2009-05-19 - new option pType for a parabola with two points -1.28 2009-03-17 - fix spurious blank for \SpecialCoor -1.27 2009-01-25 - updated \pssetlength to check for special coor - - renamed internal \next to \ps@next to prevent problems - with other packages - - added \psPline(p1)(p2)(p3) for the shortest distance - of P1 to the line p2p3 - - added \psarcAB and \psarcnAB for arcs with a given - center and two points -1.26 2008-07-31 - fixed bug with double arrow and arrowscale - - fix bug with arrows longer than the arc/line ... - - fix bug with pst@theheaders - - fix bug with trailing spaces -1.25 2008-06-17 added fill style penrose -1.24 2008-06-17 added \psDEBUG[#1]#2 for better dubugging -1.23 2008-05-23 - add octogon symbol (hv) - - fix bug with D>-<D (hv) -1.22 2008-04-14 - added shift=* option to get vertically centered - pspicture box. It is the old \pspciture[0.5] option - - add \pscircleOA(center)(point on the circle) -1.21 2008-01-24 - changed code for transparency making distiller work -1.20 2008-01-01 - added opacity for normal stroke operation (lines) - - added the arrowtype <D-D> and <D<D-D>D>, which draws the - sides as betier curves (ArrowD type in pstricks.pro) - - add special coor type (*x f(x)), which invokes the - algebraic parser for f(x) before using the default - (!x y) coor type - - add option linejoin=0,1,or 2 for connecting lines - - add option linecap=0,1,or 2 for line ends - - small tweaks to psellipticarc x y -> xOrig yOrig - - fix introduced bug with \newpsstyle: \pst@tempa->\pst@tempA - - add PS subroutines /UserCoor and /ScreenCoor for easy - transforming into user or screen coordinates - - changed wrong name of \psk@shift to \pst@shift - - fix bug with pst-node and \\[name=...]. It now uses - \ps@ifnextchar for scanning the next token - - fix bug with pst@tempg in \polar@coor. It was already used in - \pst@getangle. - - new option gridfont for the label font of \psgrid - can now be any of the PS-fonts Helvetica (Default), - Times-Roman, Palatino-Roman, ... -1.15a 2007-01-05 - \parabola->\psparabola (old name still valid) (hv) -1.15 2006-12-19 - add support for more dot styles (from Etienne Riga) -1.14c 2006-04-29 - add option linecap for dashed lines -1.14b 2006-04-20 - fix a bug in \psset@linetype -1.14a 2006-02-06 - revert the changes for pslongbox (introduced bug) -1.14 2005-12-17 - make the color part compatible to color/xcolor -1.13 2005-12-15 - fix bug of \psdot* -1.12 2005-10-25 - spurious blank for \multirput - - shift only for an absolute length - - add the missing arrows ]-[)-( -1.11 2005-09-08 - rename \rotateleft | right | down to - \psrotateleft | right | down to be consistant to the - other PSTricks macro names - - new fillstyle options - - move the code for arcs of an ellipse into pstricks.pro -1.10 2005-08-13 - fix bug with \multips (spurious blank) (hv) - - allow empty optional arrow argument \psline[..]{}(2,2) - - redefined \psarc@iv for negative loops of \nccircle - - introduce new options shift and showgrid for the - main pspicture environment - - rename \scalebox and \scaleboxto to - \psscalebox(to) to be consistant to the - other PSTricks macro names -1.08 2005-06-02 fix bug with \multips (spurious blank) (hv) -1.07 2005-05-06 make \nccircle working for counter-clockwise - orientation (hv) -1.06 2005-02-24 fix spurious blank in doublestroke (hv) + pstricks-pdf.sty -------------(hv) @@ -337,94 +90,13 @@ pstricks-doc ----------- 2021-08-21 - added news2021 2015-11-11 - updated news2015 2015-07-25 - updated news2015 -2015-06-29 - new news2015 -2014-08-28 - updated news2014 -2014-07-28 - updated news2014 -2013-12-09 - updated news2009 and news2013 -2013-11-26 - updated news2013 -2013-04-17 - updated news2013 -2011-04-30 - extensions to pst-doc.cls v 0.19 -2011-04-20 - extensions to pst-doc.cls v 0.18 -2010-11-03 - extensions to pst-doc.cls v 0.16 -2010-05-15 - extensions to pst-doc.cls v 0.15 -2010-01-04 - extensions to pst-doc.cls v 0.14 -2009-12-08 - extensions to pst-doc.cls - v 0.11 (package paralist) -2009-09-27 - extensions to pst-doc.cls -2009-08-17 - extensions to pst-doc.cls -2009-03-17 - update pst-doc.cls -2009-01-31 - update pst-doc.cls -2009-01-30 - update pst-doc.cls - - new file pst-doc.ist - - new file pst-news09.tex|pdf -2008-11-14 new file pst-doc.cls -2008-05-23 new files pst-news2008.tex|pdf - pst-news.sty for the doc -2005-12-22 new files pstnews1-14.tex|pdf -2006-12-19 new files pstnews1-15.tex|pdf - ---- pstricks.pro +1.39 2021-09-09 - run OpenCurve in a dictionary 1.38 2021-09-05 - increase memory for PenroseFill and PenrodeFillA 1.37 2021-08-27 - revert fix for .setblendmode 1.36 2021-08-25 - fix for function Penrose and PenroseA -1.35 2021-08-21 - fix for new version > 9.53 -1.34 2021-03-30 - fix bug for intro to Ghostscript >9.52 -1.33 2020-09-21 - suppress Ghostscript warning -1.32 2020-09-18 - make .setopacityalpha compatible to Ghostscript >9.52 -1.31 2020-06-09 - added support for griddx and griddy -1.30 2018-12-17 - added offset parameter for Grid -1.29 2018-11-14 - added /Power function -1.28 2017-12-30 - /AnytoDeg, /DegtoAny, /AnytoRad and /RadtoAny - - (see documentation) -1.27 2017-12-08 - P2CRel -1.26 2017-09-17 - do not load any font, leave it to the packages - - change the order for /Rect from right to left -1.25 2017-09-12 - take \ps@angleunit into account for PtoC - - PtoC360 for the original version -1.24 2016-04-22 - fixed an empty line -1.23 2014-07-31 - fixed bug with Ellipse and move to start point -1.22 2014-03-12 - added cubic spline stuff (Christoph Bersch) -1.21 2013-11-28 - deleted the overlay stuff -1.20 2013-11-26 - fix for Rand -1.19 2013-11-08 - do not put /Uput in a local dictionary -1.18 2013-11-05 - put /UUput and /Uput in local dictionaries -1.17 2013-07-08 - move the overlay part into pst-ovl.pro -1.16 2013-05-22 - save color functions -1.15 2012-10-16 - modified Div operator - - take eofill into account - - moved some helper stuff into pst-tools.pro -1.14 2012-08-13 - add eoclip for linefill and dotfill -1.13 2012-07-01 - add PenroseFillA -1.12 2012-02-12 - add option tickAngle and symbolLinewidth -1.11 2012-02-09 - fix bug -1.10 2012-02-09 - add option for curveticks with option symbol -1.09 2011-10-31 - take values Ox and Oy into account for - plot styles LineToXAxis and LineToYAxis -1.08 2011-07-09 - added sibroutine DotFill -1.07 2010-04-30 - take \psk@rot into account for \psellipse - - new helper function concatstring -1.06 2009-01-30 - cosmetic changes to the code -1.05 2008-08-02 - commented out empty lines -1.04 2008-05-11 - added Rand for a real random 0<=Rand<=1 -1.03 2008-04-15 - only some cosmetics to the code -1.02 2008-01-01 - added the arrowtype D>, sides as curves (ArrowD) - - added the whole algebraic parser stuff - - added function tan := sin cos div - - added function Tan := sin cos Div - - added Pyth2 for 2 points given by xA yA xB yB - - change variable names from x,y to xOrig, yOrig for - EllipticArcArrow - - move font setting for \psgrid into pstricks.tex -1.01 2006-01-11 (vg) fix a bug with ArcAdjust when both angles ares negative - add Sqrt sunction -1.00 2005-09-19 move the code for arcs of an ellipse from - the main pstricks.tex into this pro -97, patch 7 2005-09-11 added new fillstyles -97, patch 6 2005-05-17 added some helper stuff - RadtoDeg, DegtoRad, Pi, TwoPi, ATAN -97, patch 5 2005-03-08 bugfix for DashLine ---- pst-dots.pro @@ -433,19 +105,11 @@ pstricks-doc ----------- 2.00 2006-12-19 add more dot symbols from Etienne Riga (hv) ----- pst-tools.pro - -- file moved into package pst-tools -- - - - ---- pst-algparser.pro 0.06 2014-05-19 - fixed bug in TrigoFunc 0.05 2014-03-30 - added floor function 0.04 2011-10-31 - add !/fact/Fact for the factorial function 0.03 2010-10-10 - cosmetics -0.02 2008-08-02 - commented out empty lines - - add EXP func ( same as exp ) -0.01 2008-01-01 initial version (hv) @@ -453,69 +117,11 @@ pstricks-doc ----------- Version 97 patch 3, 98/06/01 - pstricks.sty -------- 0.71 2021-08-23 - added optional argument gsfonts 0.70 2020-06-11 - added optional argument xetex 0.69 2018-12-22 - added optional argument xetex -0.68 2018-02-08 - make grayscale and monochrome option - use the global dictionary -0.67 2018-01-06 - small changes -0.66 2018-01-01 - new switch for engine -0.65 2017-09-17 - new switch for PS versus URW fonts -0.64 2017-07-16 - modified Blendmode for option distiller -0.63 2017-03-17 - remove auto-pst-pdf support, which is now possible - with package pstricks-pdf -0.62 2015-11-14 - set distiller option adter loadung pstricks -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 - documentclass beamer -0.57 2013-05-22 - add option grayscale -0.56 2013-05-21 - add option monochrome -0.55 2013-04-05 - pass option pdfcrop=--hres to auto-pst-pdf -0.54 2013-04-05 - revert setting of the fillcolor, see 0.33 -0.53 2012-08-24 - update version number for pro files -0.52 2011-10-31 - update version number for pro files -0.51 2011-08-01 - revert test for pdflatex / lualatex -0.50 2011-04-23 - message for pst-tools.pro -0.49 2011-03-26 - test for pdflatex/lualatex -0.48 2010-11-26 - cgode changes -0.47 2010-09-18 - fix bug with option 97, load pstricks97.pro and - pst-dots97.pro -0.46 2010-08-28 - fix bug with auto-pst-pdf -0.45 2010-06-17 - add option pdf for using auto-pst-pdf together - with pdflatex (needs an option -shell-escape - for TeXLive or -enable-write18 for MiKTeX) -0.44 2010-04-24 - change version number of pstricks.pro -0.43 2010-03-20 - rename \pst@tempa to \pst@sty@tempa to prevent - problems with pst-fill -0.42 2010-03-16 - load pst-fp only once by pstricks-tex - write only a message for a LaTeX run -0.41 2010-02-11 - message for loading pst-fp -0.40 2009-01-30 - typeout an error message if the user named his - TeX source file pstricks.tex (rn) - - updated versions for the pro files -0.39 2008-10-31 - define \psDEBUG, if the old version is loaded -0.38 2008-10-19 - add new option for loading the old version from '97 -0.37 2008-01-24 - add option distiller for transparent colors -0.36 2008-01-22 - Better error message, when the document - has the same name than a PSTricks file. (RN) -0.35 2008-01-01 - add message for loading pstalpparser.pro - - add option vtex to disable opacity values -0.34 2007-09-13 - add message for loading pstricks.pro - - and pst-dots.pro (hv) -0.33 2007-02-18 set initial color (hv) -0.32 2006-08-10 message for loading the pro file (hv) -0.31 2005-12-19 one more step to a better color support (hv) -0.30 2005-11-15 drop test for pstcol - fix bug with xcolor (hv) -0.24 2005-08-30 drop support for \sclabox check, it is now renamed - in pstricks.tex (hv) -0.23 2005-06-02 Option DIA to prevent a clash with \scalebox (hv) -0.22 2005-02-25 changes were done in the wrong version -0.21 2005-02-21 fix problem with \newrgbcolor (RN,hv) + pst-all.sty -------- 2008-01-01 load pstricks-add diff --git a/graphics/pstricks/base/History b/graphics/pstricks/base/History new file mode 100644 index 0000000000..358095619a --- /dev/null +++ b/graphics/pstricks/base/History @@ -0,0 +1,505 @@ + +pstricks.tex -------- +versions like 2.47a have only changes in other files, but not +in this main package. + +3.08 2021-09-10 - moved the color stuff into a separate file + - added macros to get the color values without the color model name +3.07 2021-09-05 - fix for vee arrows in pstricks-arrows + - with optional argument "gsfonts" for PSTricks, one + can use GS fonts from URW, like StandardSymL, NimbusRomNo9L-Regu, + NimbusRomNo9L-Bold, ... + Default is using the PS fontnames, like Symbol, Times-Roman, Times-Bold, + Helvetica, Helvetica-Bold, ... + - fixed default setting for linewidth and color + - fix for \pst@rotate and lualatex, which has another y direction + - use ifPSTlualatex for the rotation shortcut definitions + - fix for \pst@rotlist +3.06 2021-08-27 - added support for experimental use of lualatex with luapstricks.lua + - enabled .setblendmode again in pstrick.pro +3.05 2021-08-25 - bug fix for Penrose fill style + - put tbasic arrows code into new pstricks-arrow.tex +3.04 2021-08-24 - moved complete arrow stuff into pst-arrow. Its hardcore macros + are loaded by default by pstricks.tex +3.03 2021-08-23 - LaTeX option gsfonts=false (default) now uses URW font Symbol instead + of GhostScript's StandardSymL->s050000l.pfb +3.02 2021-05-31 - added arrow type T<->T, similar to TikZ +3.01a 2021-03-30 - fix bug for intro to Ghostscript >9.52 in pstricks.pro +3.01 2020-09-18 - make it compatible to Ghostscript >9.52 for strokeopacity +3.00 2020-06-11 - added package pstricks-pdf for using auto-pst-pdf +2.99 2020-06-09 - added two optional arguments for \psgrid: griddx and griddy +2.97 2019-05-11 - fix for trailing space with \pscustom +2.96 2019-02-23 - use \ifx\pgfkeysloaded\relax for the test +2.95 2019-01-22 - preset dimen=inner for a circle +2.94 2019-01-07 - added \psLine which can have only one or two pair of + coordinates which are tested for a distance zero +2.93 2019-01-07 - fix for changes in pgffor.code.tex +2.92 2018-12-24 - revert chnages for \psarc (don't work for nodes as angle) +2.91 2018-12-24 - bugfix for identical angles and \psellipticatc(n) +2.90a 2018-12-22 - added optional argument xetex for pstricks.sty +2.90 2018-12-17 - undocumented feature for x|y-offset of gridlabels +2.89 2018-12-16 - allow keysetting for \rput only for valid options +2.88 2018-12-13 - fix an introduced trailing space +2.87 2018-12-11 - allow key/value setting for \rput[key=vale,...](...) +2.86a 2018-11-14 - fix for latext Ghostscript, added PS function Power + which can be used instead of exp +2.86 2018-08-23 - fix for trailing space in showgrid (#1f) +2.85 2018-08-22 - fix for trailing space in \radians +2.84 2018-05-01 - use \long\def\@fornoop from recent LaTeX +2.83a 2018-02-08 - changes in pstricks.sty +2.82 2018-01-06 - allow ! notation in \psRing for the two radii +2.81 2018-01-01 - disable engine check (defined in pstricks.sty) +2.80a 2017-12-30 - added some PS functions for conversion of angles +2.80 2017-12-08 - fix for \radians +2.79 2017-11-27 - fix rounding error in \pscircle for a big linewidth +2.78 2017-11-26 - fix for a trailing space in oefill +2.77 2017-10-04 - fix bug with wrong position for catcode change of @ + (debian bug 877682) + - created new file pstricks-tex.def for the additional + latex macros when running tex + - define \ifpst@psfonts for the TeX part +2.76a 2017-09-23 - revert the changes for PtoC: PtoC360->PtoC (old meaning) + PtoC->PtoCrel (relativ) +2.76 2017-09-17 - use an optional argument to switch between + original PostScript or URW fonts (Nimbus) + default is URW +2.75a 2017-09-12 - modifications in pstricks.pro +2.75 2017-08-24 - use always URW fonts instead of PostScript, + eg Helvetica->NimbusSanL +2.74a 2017-07-16 - modified pstricks.sty +2.74 2017-06-15 - added a randomcolor for gray, rgb, cmyk and hsb +2.73a 2017-05-22 - revert unneeded changes in pst-fp +2.73 2017-05-18 - "understandable" error message when using pdflatex + without loading auto-pst-pdf +2.72b 2017-04-19 - uploaded wrong version +2.72a 2017-04-18 - fix bug with unicode-math in pst-doc.cls +2.72 2017-04-06 - load pgf related macros only when + not done by tikz itself +2.71 2016-12-23 - added optional argument to \newpsstyle +2.70 2016-09-23 - use strokeopacity for doubleline, too +2.69 2016-09-16 - use option draft instead of overfullrule +2.68 2016-06-09 - test for \overfullrule depending to latex +2.67 2016-05-28 - fix bug for \psCirclebox@ii. depth must be negative +2.66 2016-05-19 - do the allocation stuff only for + the original TeX and not eTeX +2.65a 2016-04-22 - fix in pstricks.pro +2.65 2016-02-07 - fix bug with pst@refangle +2.64b 2015-11-14 - fix bug in pstricks.sty +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 +2.61 2015-06-28 - added optional arguments precode and postcode +2.60 2014-10-25 - make it compatible for using it with ConTeXt +2.57 2014-08-27 - take option correctAngle into account for \psellipticwedge +2.56 2014-07-31 - added gridstyleA and fixed bug with Ellipse and move + to start point +2.55 2014-07-28 - added \psellipseAB: draw an ellipse between two given points +2.54a 2014-05-19 - fixed introduced bug in pst-algparser.pro +2.54 2014-05-19 - allow circle and ellipse in \pscustom with moving + the currentpoint to the start point and not the center. +2.53a 2014-03-30 - changes in pst-algparser.pro +2.53 2014-03-12 - added cubic splines +2.52 2014-03-01 - allow rot=.. for all elliptic macros + - enable \SpecialCoor as default +2.51 2014-02-03 - make strokeopacity available for dots +2.50 2014-01-16 - added experimental fillstyle oefill, the inverse of eofill + - allow PostScript notation for \pst@checknum +2.49c 2013-12-27 - moved overlay functions into an own package +2.49b 2013-12-21 - moved overlay functions into an own dictionary +2.49a 2013-12-09 - changes in pstricks.sty +2.49 2013-12-09 - added \reversepath +2.48 2013-11-29 - fixed trailing space for !! +2.47a 2013-11-28 - changes in pst-ovl +2.47 2013-11-26 - added special coor type !! for Postfix notation + in user coordinates +2.46 2013-08-13 - fixed bug with \pstcustomize (delete a line) +2.45 2013-07-08 - moved the overlay part into pst-ovl + - added \@tfor macros if used without \LaTeX +2.44 2013-06-24 - add macros \pssetMonochrome and \pssetGrayscale + - added coor option ** for (f(y) y) +2.43 2013-05-12 - allow option ! to the labelsep of \uput +2.42 2013-04-26 - add option + for coordinates to allow + (+{x} {f(x)}) both in algebraic notation where + x must be expanded to a value. +2.41 2013-04-17 - add option for using the pgf PS functions. + in some cases they are missing. They are + defined in pst-tools.pro which is loaded + by default. +2.40 2013-04-05 - fix for showgrid=top. Uses now the + same units as showgrid=bottom + - added \psRing +2.39 2013-04-04 - fix for introduced bug for showgrid +2.38 2013-04-03 - fix for showgrid=true +2.37 2013-03-12 - fix for \uput@vii#1#2 +2.36 2013-02-09 - fix for introduced bug for pst@dotFill +2.35 2012-12-21 - fix for introduced bug with missing + definition for \@width +2.34 2012-11-18 - make package pgffor available +2.33 2012-09-23 - fix a trailing space in \pst@Pyth +2.32 2012-09-20 - added more blendmodes for distiller +2.31 2012-08-24 - fixed bug with the star version of \psellipticarc + and the additional setting of showpoints +2.30 2012-08-13 - fixed bug with the star version of \psellipticarc + - added fillstyle options eovlines, eohlines, + eovlines*, and eohlines* +2.29 2012-06-04 - fixed itroduced trailing space with boolkey +2.28 2012-05-24 - added \add@psCode, which uses \pstVerb + instead of \pstverb +2.27 2012-03-11 - activate \tx@strokeopacity for \psgrid +2.26 2012-02-19 - showgrid=top is now possible +2.25 2012-02-12 - modifications to the code of curveticks +2.24 2012-02-09 - add option for curveticks with option symbol +2.23 2011-09-04 - change also \psx|ylabelsep for pst-plot +2.22 2011-07-09 - added fillstyle dots +2.21 2011-06-07 - fix bug with a trailing space in \psForeach +2.20 2011-04-23 - load pst-tools.pro +2.19 2011-03-25 - fixed a bug with missing coordinates for pspicture +2.18 2011-02-15 - fixed a bug with correctAngle and showpoints of + \psellipticarc + - fixed introduced bug with arrowscale=... +2.17 2011-01-30 - added \psLoop for loops without a defined counter +2.16 2010-12-18 - added optional argument dashcolor and new linestyle + coloreddashed +2.15 2010-11-25 - bugfix for using \pstCheckCoorType +2.14 2010-11-14 - bugfix for using \pst@pyth. Now \pst@Pyth, which uses + no dimen registers +2.13 2010-11-01 - new macro and counter for the type of read coordinates + \pstCheckCoorType{#1} sets the macro \pst@C@@rType +% \pst@C@@rType = 0 cartesian (x,y) +% = 1 polar (r;phi) +% = 2 PS (! x y) +% = 3 mixed ((x,y)|(x,y)) +% = 4 algebraic (*x f(x)) +% = 5 node (A) +% = 6 special node ([...]A) +% = 7 node (>A) + +2.12 2010-09-16 - new optional argument for setflat + - fix bug with doubled linecap definition + - fix bug with missing linejoin in \psls@solid +2.11 2010-09-09 - new optional arguments for setting a variable + linewidth and variable color +2.10 2010-08-27 - new optional argument noCurrentPoint, which is + preset to false. +2.09 2010-07-28 - fix bug with rotation values like *0 (ms) +2.08 2010-06-06 - fix bug with uput@vii +2.07 2010-05-24 - fix bug with uput and node setting (ms) +2.06 2010-04-27 - fix bug with trailing space in \pst@isnum +2.05 2010-04-26 - fix bug with missing \psk@rot for Ellipse +2.04 2010-04-24 - take \psk@rot into account for \psellipse (hv) + - new version of \pst@divide (ms) +2.03 2010-04-12 - add keyword correctAngle=true to get an + elliptic arc with correct bow length +2.02 2010-02-23 - fix a spurious blank in \NormalCoor +2.01 2010-02-15 - fix problem with nonlinear angles for + \psellipticarc + - fix problem with tex: pst-xkey must be loaded + after we are sure having all latex macros + defined +2.00 2010-02-11 - use pst-xkey to get rid of dependencies with + other packages +1.33 2009-12-22 - add linestyle symbol +1.32 2009-12-14 - fixed bug with \hskip and fnode in psmatrix + with a new \pshspace#1 + - moved the algebraic option from pstricks-add + to the main pstricks.tex +1.31 2009-11-27 - fixed introduced problem with \pst@def +1.30 2009-10-25 - revert the changes for the \pst@object, it now + use \def\pst@par{} +1.29 2009-05-19 - new option pType for a parabola with two points +1.28 2009-03-17 - fix spurious blank for \SpecialCoor +1.27 2009-01-25 - updated \pssetlength to check for special coor + - renamed internal \next to \ps@next to prevent problems + with other packages + - added \psPline(p1)(p2)(p3) for the shortest distance + of P1 to the line p2p3 + - added \psarcAB and \psarcnAB for arcs with a given + center and two points +1.26 2008-07-31 - fixed bug with double arrow and arrowscale + - fix bug with arrows longer than the arc/line ... + - fix bug with pst@theheaders + - fix bug with trailing spaces +1.25 2008-06-17 added fill style penrose +1.24 2008-06-17 added \psDEBUG[#1]#2 for better dubugging +1.23 2008-05-23 - add octogon symbol (hv) + - fix bug with D>-<D (hv) +1.22 2008-04-14 - added shift=* option to get vertically centered + pspicture box. It is the old \pspciture[0.5] option + - add \pscircleOA(center)(point on the circle) +1.21 2008-01-24 - changed code for transparency making distiller work +1.20 2008-01-01 - added opacity for normal stroke operation (lines) + - added the arrowtype <D-D> and <D<D-D>D>, which draws the + sides as betier curves (ArrowD type in pstricks.pro) + - add special coor type (*x f(x)), which invokes the + algebraic parser for f(x) before using the default + (!x y) coor type + - add option linejoin=0,1,or 2 for connecting lines + - add option linecap=0,1,or 2 for line ends + - small tweaks to psellipticarc x y -> xOrig yOrig + - fix introduced bug with \newpsstyle: \pst@tempa->\pst@tempA + - add PS subroutines /UserCoor and /ScreenCoor for easy + transforming into user or screen coordinates + - changed wrong name of \psk@shift to \pst@shift + - fix bug with pst-node and \\[name=...]. It now uses + \ps@ifnextchar for scanning the next token + - fix bug with pst@tempg in \polar@coor. It was already used in + \pst@getangle. + - new option gridfont for the label font of \psgrid + can now be any of the PS-fonts Helvetica (Default), + Times-Roman, Palatino-Roman, ... +1.15a 2007-01-05 - \parabola->\psparabola (old name still valid) (hv) +1.15 2006-12-19 - add support for more dot styles (from Etienne Riga) +1.14c 2006-04-29 - add option linecap for dashed lines +1.14b 2006-04-20 - fix a bug in \psset@linetype +1.14a 2006-02-06 - revert the changes for pslongbox (introduced bug) +1.14 2005-12-17 - make the color part compatible to color/xcolor +1.13 2005-12-15 - fix bug of \psdot* +1.12 2005-10-25 - spurious blank for \multirput + - shift only for an absolute length + - add the missing arrows ]-[)-( +1.11 2005-09-08 - rename \rotateleft | right | down to + \psrotateleft | right | down to be consistant to the + other PSTricks macro names + - new fillstyle options + - move the code for arcs of an ellipse into pstricks.pro +1.10 2005-08-13 - fix bug with \multips (spurious blank) (hv) + - allow empty optional arrow argument \psline[..]{}(2,2) + - redefined \psarc@iv for negative loops of \nccircle + - introduce new options shift and showgrid for the + main pspicture environment + - rename \scalebox and \scaleboxto to + \psscalebox(to) to be consistant to the + other PSTricks macro names +1.08 2005-06-02 fix bug with \multips (spurious blank) (hv) +1.07 2005-05-06 make \nccircle working for counter-clockwise + orientation (hv) +1.06 2005-02-24 fix spurious blank in doublestroke (hv) + + +pstricks-pdf.sty -------------(hv) +0.02 2020-08-18 - set ps2pdf=-dALLOWPSTRANSPARENCY as default +0.01 2020-06-11 - first CTAN version + + + +pst-fp.tex ----------- (hv) + v 0.06 2010-05-14 delete catcode change of @ + v 0.05 2010-01-17 add \pst@Int + add \pst@int + v 0.04 2009-11-24 add \pstFPadd + v 0.03 2009-11-14 add \pstFPmul + v 0.02 2009-04-02 initial version + + + + +xdvipdfmx.con ------ +0.07 2021-09-05 - fix for ps: -> pst: +0.06 2021-08-21 - small changes in the code +0.05 2015-09-11 - move the fix into pstricks.tex +0.04 2015-09-11 - fix bug with wrong scaling for \psput@cartesian +0.03 2011-11-23 - fix bug with wrong scaling for nodes +0.02 2010-08-02 - uncomment redefinition of \pst@starbox +0.01 2007-03-11 - first CTAN version, must be renamed to pstricks.con + when used with XeTeX + + + +vtex.con ------ +0.02 2008-01-01 - disable transparent color setting + + + +pstricks-doc ----------- +2021-08-25 - updated news2021 +2021-08-21 - added news2021 +2015-11-11 - updated news2015 +2015-07-25 - updated news2015 +2015-06-29 - new news2015 +2014-08-28 - updated news2014 +2014-07-28 - updated news2014 +2013-12-09 - updated news2009 and news2013 +2013-11-26 - updated news2013 +2013-04-17 - updated news2013 +2011-04-30 - extensions to pst-doc.cls v 0.19 +2011-04-20 - extensions to pst-doc.cls v 0.18 +2010-11-03 - extensions to pst-doc.cls v 0.16 +2010-05-15 - extensions to pst-doc.cls v 0.15 +2010-01-04 - extensions to pst-doc.cls v 0.14 +2009-12-08 - extensions to pst-doc.cls + v 0.11 (package paralist) +2009-09-27 - extensions to pst-doc.cls +2009-08-17 - extensions to pst-doc.cls +2009-03-17 - update pst-doc.cls +2009-01-31 - update pst-doc.cls +2009-01-30 - update pst-doc.cls + - new file pst-doc.ist + - new file pst-news09.tex|pdf +2008-11-14 new file pst-doc.cls +2008-05-23 new files pst-news2008.tex|pdf + pst-news.sty for the doc +2005-12-22 new files pstnews1-14.tex|pdf +2006-12-19 new files pstnews1-15.tex|pdf + + + +---- pstricks.pro +1.39 2021-09-09 - run OpenCurve in a dictionary +1.38 2021-09-05 - increase memory for PenroseFill and PenrodeFillA +1.37 2021-08-27 - revert fix for .setblendmode +1.36 2021-08-25 - fix for function Penrose and PenroseA +1.35 2021-08-21 - fix for new version > 9.53 +1.34 2021-03-30 - fix bug for intro to Ghostscript >9.52 +1.33 2020-09-21 - suppress Ghostscript warning +1.32 2020-09-18 - make .setopacityalpha compatible to Ghostscript >9.52 +1.31 2020-06-09 - added support for griddx and griddy +1.30 2018-12-17 - added offset parameter for Grid +1.29 2018-11-14 - added /Power function +1.28 2017-12-30 - /AnytoDeg, /DegtoAny, /AnytoRad and /RadtoAny + - (see documentation) +1.27 2017-12-08 - P2CRel +1.26 2017-09-17 - do not load any font, leave it to the packages + - change the order for /Rect from right to left +1.25 2017-09-12 - take \ps@angleunit into account for PtoC + - PtoC360 for the original version +1.24 2016-04-22 - fixed an empty line +1.23 2014-07-31 - fixed bug with Ellipse and move to start point +1.22 2014-03-12 - added cubic spline stuff (Christoph Bersch) +1.21 2013-11-28 - deleted the overlay stuff +1.20 2013-11-26 - fix for Rand +1.19 2013-11-08 - do not put /Uput in a local dictionary +1.18 2013-11-05 - put /UUput and /Uput in local dictionaries +1.17 2013-07-08 - move the overlay part into pst-ovl.pro +1.16 2013-05-22 - save color functions +1.15 2012-10-16 - modified Div operator + - take eofill into account + - moved some helper stuff into pst-tools.pro +1.14 2012-08-13 - add eoclip for linefill and dotfill +1.13 2012-07-01 - add PenroseFillA +1.12 2012-02-12 - add option tickAngle and symbolLinewidth +1.11 2012-02-09 - fix bug +1.10 2012-02-09 - add option for curveticks with option symbol +1.09 2011-10-31 - take values Ox and Oy into account for + plot styles LineToXAxis and LineToYAxis +1.08 2011-07-09 - added sibroutine DotFill +1.07 2010-04-30 - take \psk@rot into account for \psellipse + - new helper function concatstring +1.06 2009-01-30 - cosmetic changes to the code +1.05 2008-08-02 - commented out empty lines +1.04 2008-05-11 - added Rand for a real random 0<=Rand<=1 +1.03 2008-04-15 - only some cosmetics to the code +1.02 2008-01-01 - added the arrowtype D>, sides as curves (ArrowD) + - added the whole algebraic parser stuff + - added function tan := sin cos div + - added function Tan := sin cos Div + - added Pyth2 for 2 points given by xA yA xB yB + - change variable names from x,y to xOrig, yOrig for + EllipticArcArrow + - move font setting for \psgrid into pstricks.tex +1.01 2006-01-11 (vg) fix a bug with ArcAdjust when both angles ares negative + add Sqrt sunction +1.00 2005-09-19 move the code for arcs of an ellipse from + the main pstricks.tex into this pro +97, patch 7 2005-09-11 added new fillstyles +97, patch 6 2005-05-17 added some helper stuff + RadtoDeg, DegtoRad, Pi, TwoPi, ATAN +97, patch 5 2005-03-08 bugfix for DashLine + + +---- pst-dots.pro +2.02 2008-04-19 add octogon symbol (hv) +2.01 2008-04-18 add some comments to the code (hv) +2.00 2006-12-19 add more dot symbols from Etienne Riga (hv) + + +---- pst-tools.pro + -- file moved into package pst-tools -- + + + +---- pst-algparser.pro +0.06 2014-05-19 - fixed bug in TrigoFunc +0.05 2014-03-30 - added floor function +0.04 2011-10-31 - add !/fact/Fact for the factorial function +0.03 2010-10-10 - cosmetics +0.02 2008-08-02 - commented out empty lines + - add EXP func ( same as exp ) +0.01 2008-01-01 initial version (hv) + + + +---- pstricks97.pro +Version 97 patch 3, 98/06/01 + + + +pstricks.sty -------- +0.71 2021-08-23 - added optional argument gsfonts +0.70 2020-06-11 - added optional argument xetex +0.69 2018-12-22 - added optional argument xetex +0.68 2018-02-08 - make grayscale and monochrome option + use the global dictionary +0.67 2018-01-06 - small changes +0.66 2018-01-01 - new switch for engine +0.65 2017-09-17 - new switch for PS versus URW fonts +0.64 2017-07-16 - modified Blendmode for option distiller +0.63 2017-03-17 - remove auto-pst-pdf support, which is now possible + with package pstricks-pdf +0.62 2015-11-14 - set distiller option adter loadung pstricks +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 + documentclass beamer +0.57 2013-05-22 - add option grayscale +0.56 2013-05-21 - add option monochrome +0.55 2013-04-05 - pass option pdfcrop=--hres to auto-pst-pdf +0.54 2013-04-05 - revert setting of the fillcolor, see 0.33 +0.53 2012-08-24 - update version number for pro files +0.52 2011-10-31 - update version number for pro files +0.51 2011-08-01 - revert test for pdflatex / lualatex +0.50 2011-04-23 - message for pst-tools.pro +0.49 2011-03-26 - test for pdflatex/lualatex +0.48 2010-11-26 - cgode changes +0.47 2010-09-18 - fix bug with option 97, load pstricks97.pro and + pst-dots97.pro +0.46 2010-08-28 - fix bug with auto-pst-pdf +0.45 2010-06-17 - add option pdf for using auto-pst-pdf together + with pdflatex (needs an option -shell-escape + for TeXLive or -enable-write18 for MiKTeX) +0.44 2010-04-24 - change version number of pstricks.pro +0.43 2010-03-20 - rename \pst@tempa to \pst@sty@tempa to prevent + problems with pst-fill +0.42 2010-03-16 - load pst-fp only once by pstricks-tex + write only a message for a LaTeX run +0.41 2010-02-11 - message for loading pst-fp +0.40 2009-01-30 - typeout an error message if the user named his + TeX source file pstricks.tex (rn) + - updated versions for the pro files +0.39 2008-10-31 - define \psDEBUG, if the old version is loaded +0.38 2008-10-19 - add new option for loading the old version from '97 +0.37 2008-01-24 - add option distiller for transparent colors +0.36 2008-01-22 - Better error message, when the document + has the same name than a PSTricks file. (RN) +0.35 2008-01-01 - add message for loading pstalpparser.pro + - add option vtex to disable opacity values +0.34 2007-09-13 - add message for loading pstricks.pro + - and pst-dots.pro (hv) +0.33 2007-02-18 set initial color (hv) +0.32 2006-08-10 message for loading the pro file (hv) +0.31 2005-12-19 one more step to a better color support (hv) +0.30 2005-11-15 drop test for pstcol + fix bug with xcolor (hv) +0.24 2005-08-30 drop support for \sclabox check, it is now renamed + in pstricks.tex (hv) +0.23 2005-06-02 Option DIA to prevent a clash with \scalebox (hv) +0.22 2005-02-25 changes were done in the wrong version +0.21 2005-02-21 fix problem with \newrgbcolor (RN,hv) + +pst-all.sty -------- + 2008-01-01 load pstricks-add + 2007-09-13 change order of the packages + 2006-12-19 do not load pst-char, it is now part of pst-text + diff --git a/graphics/pstricks/base/config/distiller.cfg b/graphics/pstricks/base/config/distiller.cfg index db654b14d7..9ade331215 100644 --- a/graphics/pstricks/base/config/distiller.cfg +++ b/graphics/pstricks/base/config/distiller.cfg @@ -1,4 +1,4 @@ -% $Id: distiller.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: distiller.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: distiller.con (for distiller driver) %% %% Configuration file for PSTricks diff --git a/graphics/pstricks/base/config/dvips.cfg b/graphics/pstricks/base/config/dvips.cfg index d9648c1d0a..f9c5da698e 100644 --- a/graphics/pstricks/base/config/dvips.cfg +++ b/graphics/pstricks/base/config/dvips.cfg @@ -1,4 +1,4 @@ -% $Id: dvips.cfg 797 2018-08-23 18:33:16Z herbert $ +% $Id: dvips.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for dvips driver) %% %% Configuration file for PSTricks diff --git a/graphics/pstricks/base/config/dvipsone.cfg b/graphics/pstricks/base/config/dvipsone.cfg index 965e635fd5..bb59975bfa 100644 --- a/graphics/pstricks/base/config/dvipsone.cfg +++ b/graphics/pstricks/base/config/dvipsone.cfg @@ -1,4 +1,4 @@ -% $Id: dvipsone.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: dvipsone.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN pstricks.con (for DVIPSONE driver) %% %% Configuration file for PSTricks 97: must be renamed `pstricks.con' diff --git a/graphics/pstricks/base/config/gastex.cfg b/graphics/pstricks/base/config/gastex.cfg index b3549c8c56..f0fe5486cd 100644 --- a/graphics/pstricks/base/config/gastex.cfg +++ b/graphics/pstricks/base/config/gastex.cfg @@ -1,4 +1,4 @@ -% $Id: gastex.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: gastex.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for xdvipdfmx driver) %% %% Configuration file for PSTricks diff --git a/graphics/pstricks/base/config/textures.cfg b/graphics/pstricks/base/config/textures.cfg index 48667d3950..ef088b5791 100644 --- a/graphics/pstricks/base/config/textures.cfg +++ b/graphics/pstricks/base/config/textures.cfg @@ -1,4 +1,4 @@ -% $Id: textures.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: textures.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN pstricks.con (for Textures 1.7 and 1.8 driver) %% %% Configuration file for PSTricks 97: must be renamed `pstricks.con' diff --git a/graphics/pstricks/base/config/vtex.cfg b/graphics/pstricks/base/config/vtex.cfg index e4b7184404..7cb84c0f9e 100644 --- a/graphics/pstricks/base/config/vtex.cfg +++ b/graphics/pstricks/base/config/vtex.cfg @@ -1,4 +1,4 @@ -% $Id: vtex.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: vtex.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for VTeX) %% %% Configuration file for PSTricks 97 diff --git a/graphics/pstricks/base/doc/PSTricks.bib b/graphics/pstricks/base/doc/PSTricks.bib index daaa78d445..d49525facf 100644 --- a/graphics/pstricks/base/doc/PSTricks.bib +++ b/graphics/pstricks/base/doc/PSTricks.bib @@ -1,4 +1,21 @@ @STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{beiprogramm = {{\TeX}-Beiprogramm}} +@STRING{bretter = {Bretter, die die Welt bedeuten}} +@STRING{dtk = {DTK}} +@STRING{editorial = {Editorial}} +@STRING{fremdebuehne = {Von fremden Bühnen}} +@STRING{fundus = {Aus dem Fundus}} +@STRING{grusswort = {Grußwort}} +@STRING{hinterbuehne = {Hinter der Bühne}} +@STRING{komascript = {\KOMAScript}} +@STRING{leserbriefe = {Leserbriefe}} +@STRING{magazin = {Magazin}} +@STRING{rezensionen = {Bücher und Rezensionen}} +@STRING{schonimmer = {Was Sie schon immer über {\TeX} wissen wollten, \dots}} +@STRING{spielplan = {Spielplan}} +@STRING{theaterkasse = {Von der Theaterkasse}} +@STRING{theatertage = {{\TeX}-Theatertage}} +@STRING{tippstricks = {Tipps und Tricks}} @Book{PostScript, Author = {Kollock, Nikolai G.}, diff --git a/graphics/pstricks/base/doc/pst-doc.cls b/graphics/pstricks/base/doc/pst-doc.cls index 9e4b244dab..bcbd86fc5d 100644 --- a/graphics/pstricks/base/doc/pst-doc.cls +++ b/graphics/pstricks/base/doc/pst-doc.cls @@ -455,24 +455,25 @@ xleftmargin=0pt,xrightmargin=0pt, \def\settitle{% \thispagestyle{empty}% \begin{titlepage} + \newgeometry{lmargin=1cm,rmargin=1cm,bmargin=1cm,includeheadfoot} \ifpdf \AddToShipoutPicture*{\includegraphics{pst-doc.pdf}} \vspace*{0.3\textheight} \parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}\\[5pt] \parbox{15cm}{\sffamily\Large\@subtitle} - \vspace{4cm} + \vspace{2cm} \parbox{10cm}{\sffamily\@date} \vfill - \makebox[\textwidth]{\bgImage} + \makebox[\textwidth]{\makebox(0,0){\bgImage}} - \vfill \parbox[b]{19cm}{\sffamily\RaggedRight \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\ \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{% \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}} + \clearpage\restoregeometry \else \psset{unit=1cm} \begin{pspicture}(1.6in,0)(23cm,21.7cm) diff --git a/graphics/pstricks/base/doc/pst-news.tex b/graphics/pstricks/base/doc/pst-news.tex index f9e40428f8..6f3946714c 100644 --- a/graphics/pstricks/base/doc/pst-news.tex +++ b/graphics/pstricks/base/doc/pst-news.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news.tex 444 2017-04-19 10:55:35Z herbert $ +%% $Id: pst-news.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news08.pdf b/graphics/pstricks/base/doc/pst-news08.pdf Binary files differindex 428653ebf2..00811580d4 100644 --- a/graphics/pstricks/base/doc/pst-news08.pdf +++ b/graphics/pstricks/base/doc/pst-news08.pdf diff --git a/graphics/pstricks/base/doc/pst-news09.tex b/graphics/pstricks/base/doc/pst-news09.tex index 4a656a8566..a548f6e1bb 100644 --- a/graphics/pstricks/base/doc/pst-news09.tex +++ b/graphics/pstricks/base/doc/pst-news09.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news09.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news09.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news10.tex b/graphics/pstricks/base/doc/pst-news10.tex index d4c018d92e..e679c0a617 100644 --- a/graphics/pstricks/base/doc/pst-news10.tex +++ b/graphics/pstricks/base/doc/pst-news10.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news10.tex 697 2017-12-30 19:04:03Z herbert $ +%% $Id: pst-news10.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV12,bibliography=totoc,parskip=false,headings=small,, headinclude=false,footinclude=false,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news11.tex b/graphics/pstricks/base/doc/pst-news11.tex index a4254f226f..61efbef06c 100644 --- a/graphics/pstricks/base/doc/pst-news11.tex +++ b/graphics/pstricks/base/doc/pst-news11.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news11.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news11.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news12.tex b/graphics/pstricks/base/doc/pst-news12.tex index 759869d864..2b3e185931 100644 --- a/graphics/pstricks/base/doc/pst-news12.tex +++ b/graphics/pstricks/base/doc/pst-news12.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news12.tex 847 2018-12-04 08:04:28Z herbert $ +%% $Id: pst-news12.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news13.tex b/graphics/pstricks/base/doc/pst-news13.tex index 2995cf042d..04b7de5995 100644 --- a/graphics/pstricks/base/doc/pst-news13.tex +++ b/graphics/pstricks/base/doc/pst-news13.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news13.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news13.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news14.tex b/graphics/pstricks/base/doc/pst-news14.tex index 75b209b580..f0a108fba1 100644 --- a/graphics/pstricks/base/doc/pst-news14.tex +++ b/graphics/pstricks/base/doc/pst-news14.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news14.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news14.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news15.tex b/graphics/pstricks/base/doc/pst-news15.tex index c2369d7018..231a8bd38c 100644 --- a/graphics/pstricks/base/doc/pst-news15.tex +++ b/graphics/pstricks/base/doc/pst-news15.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news15.tex 444 2017-04-19 10:55:35Z herbert $ +%% $Id: pst-news15.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news16.tex b/graphics/pstricks/base/doc/pst-news16.tex index 9a544ca5bd..b0d91ec84a 100644 --- a/graphics/pstricks/base/doc/pst-news16.tex +++ b/graphics/pstricks/base/doc/pst-news16.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news16.tex 446 2017-04-19 11:40:55Z herbert $ +%% $Id: pst-news16.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news17.tex b/graphics/pstricks/base/doc/pst-news17.tex index 53cf23c2ce..1bd25716a6 100644 --- a/graphics/pstricks/base/doc/pst-news17.tex +++ b/graphics/pstricks/base/doc/pst-news17.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news17.tex 699 2017-12-31 10:27:45Z herbert $ +%% $Id: pst-news17.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news18.tex b/graphics/pstricks/base/doc/pst-news18.tex index dde1638e58..ac3ec7c4a4 100644 --- a/graphics/pstricks/base/doc/pst-news18.tex +++ b/graphics/pstricks/base/doc/pst-news18.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news17.tex 699 2017-12-31 10:27:45Z herbert $ +%% $Id: pst-news18.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles diff --git a/graphics/pstricks/base/doc/pst-news19.pdf b/graphics/pstricks/base/doc/pst-news19.pdf Binary files differindex 4c32cf3c1c..8fceedb1b9 100644 --- a/graphics/pstricks/base/doc/pst-news19.pdf +++ b/graphics/pstricks/base/doc/pst-news19.pdf diff --git a/graphics/pstricks/base/doc/pst-news19.tex b/graphics/pstricks/base/doc/pst-news19.tex index 9db696bc29..c670a6697d 100644 --- a/graphics/pstricks/base/doc/pst-news19.tex +++ b/graphics/pstricks/base/doc/pst-news19.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news19.tex 934 2019-02-23 14:07:34Z herbert $ +%% $Id: pst-news19.tex 4 2020-06-09 08:32:19Z herbert $ \PassOptionsToPackage{useCalc}{pstricks} \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} @@ -54,9 +54,11 @@ this new file. %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.tex} (v. 2.94 -- 2019/01/07)} +\section{\texttt{pstricks.tex} (v. 2.98 -- 2019/05/16)} %-------------------------------------------------------------------------------------- +\subsection{Plotting multilines} + There is a new macro called \Lcs{psLine} (uppercase L!) which can have only one or two pairs of coordinates. Remember that \Lcs{psline} can have more. With \Lcs{psLine} and an defined arrow you'll get nothing for something @@ -118,6 +120,36 @@ coordinates. It needs \end{LTXexample} \fi +%$ + +\subsection{Relative coordinates -- experimental} + +All objects which can have at least two pairs of coordinates +can use the »+«-operator to mark relative coordinates: + +\begin{BDef} +\Lcs{psline}\OptArgs\OptArg{\Largr{$x_0,y_0$}}\Largr{$x_1,y_1$}+\Largr{$x_2,y_2$}\ldots\\ +\end{BDef} + +\begin{LTXexample}[width=5.5cm] +\begin{pspicture}[showgrid](5,5) +\psline[linecolor=blue]{->}% + (1,1)+(3,4)+(-2,-3) +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[width=5.5cm] +\begin{pspicture}[showgrid](-1,-2)(4,3) +\psaxes[labels=none]{->}(0,0)(-1,-2)(4,3) +\psbezier% + (!0.8 -95 PtoC 1 sub)+(8.5;85)+(5;-100)(2,1)% + +(1;-70)+(0.5;-110)(3,2)% + +(1;-80)+(0.5;95)(3.4,-0.8) +\end{pspicture} +\end{LTXexample} + + \subsection{Error message} diff --git a/graphics/pstricks/base/doc/pst-news20.tex b/graphics/pstricks/base/doc/pst-news20.tex index 00acba1ff2..f5a8094d14 100644 --- a/graphics/pstricks/base/doc/pst-news20.tex +++ b/graphics/pstricks/base/doc/pst-news20.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news20.tex 23 2020-09-18 06:29:04Z herbert $ +%% $Id: pst-news20.tex 25 2020-09-18 06:59:21Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{scrartcl} diff --git a/graphics/pstricks/base/doc/pst-news21.pdf b/graphics/pstricks/base/doc/pst-news21.pdf Binary files differindex fde6b2fc62..a1b597feef 100644 --- a/graphics/pstricks/base/doc/pst-news21.pdf +++ b/graphics/pstricks/base/doc/pst-news21.pdf diff --git a/graphics/pstricks/base/doc/pst-news21.tex b/graphics/pstricks/base/doc/pst-news21.tex index 447b9ba207..7eafc6f3aa 100644 --- a/graphics/pstricks/base/doc/pst-news21.tex +++ b/graphics/pstricks/base/doc/pst-news21.tex @@ -1,4 +1,6 @@ -%% $Id: pst-news21.tex 191 2021-09-05 20:07:31Z herbert $ +%% $Id: pst-news21.tex 212 2021-09-10 09:21:06Z herbert $ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{} \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} @@ -25,6 +27,13 @@ \part{\texttt{pstricks} -- package} +This version of the News was run with \verb|lualatex| \emph{without} using Ghostscript. +The PDF file was created in a direkt way by Lua. If you want to try it, then look +at \url{https://github.com/zauguin/luapstricks}. + + + + %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.sty}} %-------------------------------------------------------------------------------------- @@ -34,9 +43,30 @@ Otherwise the one from URW or the system is used, which is the default. %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.tex} (v. 3.03 -- 2021/08/23)} +\section{\texttt{pstricks.tex} (v. 3.08 -- 2021/09/10)} %-------------------------------------------------------------------------------------- +\subsection{Colors} + +There are two new macros to get the color values: + +\begin{verbatim} +\psgetRGBColorValues{<color macro>} +\psgetCMYKColorValues{<color macro>} +\end{verbatim} + +An Example: + +\begin{LTXexample}[width=5cm] +\psset{linecolor=red!40} +\psgetRGBColorValues{\pslinecolor} + +\colorlet{Blue}[cmyk]{blue} +\psset{linecolor=Blue!40} +\psgetCMYKColorValues{\pslinecolor} +\end{LTXexample} + + \subsection{Arrows} @@ -132,9 +162,6 @@ the optional argument \texttt{gsfonts}: There was a bug if this fillstyle was used together with a line sequence. - - - \psset{unit=1cm} \centering\vspace{5cm} \pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5) @@ -166,6 +193,9 @@ There was a bug if this fillstyle was used together with a line sequence. \end{lstlisting} +\iffalse + + \pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5) \rput(0,0){\parbox{4.5cm}{% @@ -193,7 +223,10 @@ There was a bug if this fillstyle was used together with a line sequence. \endpspicture\end{lstlisting} -\section{\LuaLaTeX} +\fi + + +\section{\LuaLaTeX}\label{lua} Currently one has to use package \LPack{auto-pst-pdf-lua} if a document with \PSTricks-code should be run \emph{directly} with \LuaLaTeX, without using GhostScript. This version has experimental basic support for the lua package diff --git a/graphics/pstricks/base/dvips/pstricks.pro b/graphics/pstricks/base/dvips/pstricks.pro index 91824e557c..8587712fce 100644 --- a/graphics/pstricks/base/dvips/pstricks.pro +++ b/graphics/pstricks/base/dvips/pstricks.pro @@ -1,7 +1,7 @@ -% $Id: pstricks.pro 191 2021-09-05 20:07:31Z herbert $ +% $Id: pstricks.pro 217 2021-09-10 13:50:31Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.38, 2021/09/05 +%% Version 1.39, 2021/09/10 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -121,22 +121,6 @@ tx@Dict begin /startGlobal { true setglobal globaldict begin } bind def /endGlobal { end false setglobal } bind def % -/setpdfcolor where { % luapstricks specific code - /setpdfcolor get /pssetPDFcolor exch def - /setpdfcolor { - pssetPDFcolor - mark - currentcolor - currentcolorspace 0 get - dup /DeviceRGB eq { pop setrgbcolor } { - dup /DeviceCMYK eq { pop setcmykcolor } { - /DeviceGray eq { setgray } if - } ifelse - } ifelse - cleartomark - } def -} if -% /pssetRGBcolor /setrgbcolor load def /pssetCMYKcolor /setcmykcolor load def /pssetGraycolor /setgray load def @@ -721,9 +705,11 @@ tx@Dict begin /EAC { x2 y2 x y ArrowB curveto pop pop } def % /OpenCurve { + 5 dict begin NArray n 3 lt { n { pop pop } repeat } { BOC /n n 3 sub def n { NC } repeat EOC } ifelse + end } def % /CurvePath { diff --git a/graphics/pstricks/base/generic/pst-fp.tex b/graphics/pstricks/base/generic/pst-fp.tex index 34cfb16f9e..e00736bdeb 100644 --- a/graphics/pstricks/base/generic/pst-fp.tex +++ b/graphics/pstricks/base/generic/pst-fp.tex @@ -1,4 +1,4 @@ -%% $Id: pst-fp.tex 4 2020-06-09 08:32:19Z herbert $ +%% $Id: pst-fp.tex 68 2021-04-08 06:41:14Z herbert $ %% %% %% This is file `pst-fp.tex', @@ -18,16 +18,16 @@ %% `pst-fp' is a PSTricks related package for a division, %% multiplication and addition %% +% +\def\fileversion{0.06} +\def\filedate{2020/11/20} +\message{`pst-fp' v\fileversion, \filedate\space (hv)} + \csname PSTFPloaded\endcsname \let\PSTFPloaded\endinput -% % Requires some packages \ifx\PSTricksLoaded\endinput\else\input pstricks \fi % -\def\fileversion{0.05} -\def\filedate{2010/01/17} -\message{`pst-fp' v\fileversion, \filedate\space (hv)} -% \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax %fixed point arithmetic with values between (including) diff --git a/graphics/pstricks/base/generic/pstricks-arrows.tex b/graphics/pstricks/base/generic/pstricks-arrows.tex index 0d89aa6b98..5684f3d792 100644 --- a/graphics/pstricks/base/generic/pstricks-arrows.tex +++ b/graphics/pstricks/base/generic/pstricks-arrows.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-arrows.tex 168 2021-08-28 08:43:24Z herbert $ +%% $Id: pstricks-arrows.tex 164 2021-08-25 19:26:42Z herbert $ %% %% This is file `pstricks-arrows.tex', %% @@ -279,18 +279,35 @@ \psset[pstricks]{filledveearrowlength=3mm} % default projected length \define@key[psset]{pstricks}{filledveearrowangle}[15]{\pst@getangle{#1}\psk@filledveearrowangle} \psset[pstricks]{filledveearrowangle=15} % default angle -\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.8pt]{\pst@getlength{#1}\psk@filledveearrowlinewidth} -\psset[pstricks]{filledveearrowlinewidth=\pslinewidth} % default vee arrow line width +\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.35mm]{\pst@getlength{#1}\psk@filledveearrowlinewidth} +\psset[pstricks]{filledveearrowlinewidth=0.35mm} % default vee arrow line width \define@key[psset]{pstricks}{arrowlinestyle}[solid]{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psarrowlinestyle{#1}}} \psset[pstricks]{arrowlinestyle=solid} % default - -\@namedef{psas@|}{\ps@check@tipcolor \psk@tbarsize \tx@Tbar} +\pst@def{VeeArrow}<% + 1 setlinecap % round caps + 1 setlinejoin % round join + setlinewidth % vee arrow line width + /y ED % projected length + 2 div /a ED % angle (divide by 2) + /t ED % false = inside, true = outside + a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y + t { 1 -1 scale } if % if outside : symmetry + x neg y moveto % point #1 + 0 0 L % point #2 + x y L % point #3 + { closepath gsave fill grestore } if % if filled : close and fill + \@nameuse{psls@\psarrowlinestyle} + \ps@check@tipcolor + stroke % draw line + 0 t { y 2 mul } { 0 } ifelse moveto> % if outside : twice longer line % VeeArrow : filled? outside? (total) angle (projected) length (arrow) line width +\@namedef{psas@|}{\ps@check@tipcolor \psk@tbarsize \tx@Tbar} + \@namedef{psas@v}{% \ps@check@tipcolor false false \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow} @@ -298,37 +315,12 @@ \ps@check@tipcolor false true \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow} \@namedef{psas@f}{% - \ps@check@tipcolor + \ps@check@tipcolor true false \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow} \@namedef{psas@F}{% \ps@check@tipcolor true true \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow} -\pst@def{VeeArrow}<% - 5 dict begin - \pst@arrowscale\space div SLW % vee arrow line width - /y ED % projected length - 2 div /a ED % angle (divide by 2) - /t ED % false = inside, true = outside - a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y - /x2 x dup add def - t { 1 -1 scale } if % if outside : symmetry -% newpath x2 neg y moveto 0 y neg rlineto x2 dup add 0 rlineto 0 y rlineto closepath clip % to get rid of linecap problem - newpath - x neg y moveto % lower left - 0 0 lineto % arrow tip - x y lineto % upper left - 0 setlinecap % round caps - 2 setlinejoin % round join - { closepath 0 setlinewidth gsave fill grestore } if % if filled : close and fill - \@nameuse{psls@\psarrowlinestyle} - \ps@check@tipcolor - stroke % draw line - 0 t { y 2 mul } { 0 } ifelse moveto - end -> % if outside : twice longer line - - % And An another arrowhead % architectural tick / oblique arrow diff --git a/graphics/pstricks/base/generic/pstricks-color.tex b/graphics/pstricks/base/generic/pstricks-color.tex new file mode 100644 index 0000000000..708a4260a5 --- /dev/null +++ b/graphics/pstricks/base/generic/pstricks-color.tex @@ -0,0 +1,137 @@ +%% $Id: pstricks-arrows.tex 168 2021-08-28 08:43:24Z herbert $ +%% +%% This is file `pstricks-color.tex', +%% +%% IMPORTANT NOTICE: +%% +%% Herbert Voss <hvoss@tug.org> +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. +%% +%% DESCRIPTION: +%% `pstricks-color' base code for color settings +%% +%% fileversion and filedate see main file pstricks.tex +%% +\pstVerb{ + /pssetRGBcolor /setrgbcolor load def + /pssetCMYKcolor /setcmykcolor load def + /pssetGraycolor /setgray load def +} +\def\@newcolor#1#2{% + \expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}% + %\expandafter\edef\csname color@#1\endcsname{#2}% + \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 + \ignorespaces} +% +\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% +\def\pst@endcolor{\pstVerb{\pst@currentcolor}} +\def\pst@currentcolor{0 setgray} +\def\altcolormode{% +\def\pst@color##1{% + \pstVerb{gsave ##1}\aftergroup\pst@endcolor}% +\def\pst@endcolor{\pstVerb{\pst@grestore}}} + +\def\psgetRGBColorValues#1{\expandafter\psgetRGBColorvalues@i#1;} +\def\psgetRGBColorvalues@i#1#2#3#4#5;{\expandafter\psgetRGBColorvalues@ii#5,,,;} +\def\psgetRGBColorvalues@ii#1,#2,#3,#4;{% + \ifx\relax#2\relax + #1 % gray color model + \else + #1 #2 #3 + \fi} + +\def\psgetCMYKColorValues#1{\expandafter\psgetCMYKColorvalues@i#1;} +\def\psgetCMYKColorvalues@i#1#2#3#4#5;{\expandafter\psgetCMYKColorvalues@ii#5,,,,;} +\def\psgetCMYKColorvalues@ii#1,#2,#3,#4,#5;{% + \ifx\relax#2\relax + #1 % gray color model + \else + #1 #2 #3 #4 + \fi} + +\iffalse +\def\ps@RGB@model{rgb} +\def\psgetColorValues#1{\makeatletter\expandafter\psgetColorvalues@i#1;\makeatother} +\gdef\psgetColorvalues@i#1#2#3#4#5;{% + \scantokens{\def\pst@tempA{#4}} + \if\pst@tempA\ps@RGB@model + \expandafter\psgetRGBColorvalues@ii#5; + \else + \expandafter\psgetCMYKColorvalues@ii#5; + \fi +} +\fi + +\def\pssetMonochrome{% + \pstVerb{ + /setrgbcolor { add add 0 gt {0}{1} 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 {0}{1} ifelse setgray } def }} +\def\pssetGrayscale{% + \pstVerb{ + /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 }} +\def\psresetColor{\pstVerb{ + /setrgbcolor tx@Dict begin /pssetRGBcolor load end def + /setcmykcolor tx@Dict begin /pssetCMYKcolor load end def }} + +%\def\pst@usecolor#1{\csname color@#1\endcsname\space}% hv 1.14 2005--12-17 +\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} +% +\def\newgray#1#2{% + \pst@checknum{#2}\pst@tempg + \@newcolor{#1}{\pst@tempg setgray}}% +\def\newrgbcolor#1#2{% + \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} +\def\newhsbcolor#1#2{% + \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}} +\def\newcmykcolor#1#2{% + \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}} +\newgray{black}{0} +\newgray{darkgray}{.25} +\newgray{gray}{.5} +\newgray{lightgray}{.75} +\newgray{white}{1} +\newrgbcolor{red}{1 0 0} +\newrgbcolor{green}{0 1 0} +\newrgbcolor{blue}{0 0 1} +\newrgbcolor{yellow}{1 1 0} +\newrgbcolor{cyan}{0 1 1} +\newrgbcolor{magenta}{1 0 1} + +\@ifundefined{xglobal}% do we have xcolor loaded? + {\@newcolor{randomgray}{tx@Dict begin Rand setgray end}% + \@newcolor{randomrgb}{tx@Dict begin Rand Rand Rand setrgbcolor end}% + \@newcolor{randomcmyk}{tx@Dict begin Rand Rand Rand Rand setcmykcolor end}% + \@newcolor{randomhsb}{tx@Dict begin Rand Rand Rand sethsbcolor end}% + }{% + \definecolor[ps]{randomgray}{gray}{tx@Dict begin Rand end}% + \definecolor[ps]{randomrgb}{rgb}{tx@Dict begin Rand Rand Rand end}% + \definecolor[ps]{randomcmyk}{cmyk}{tx@Dict begin Rand Rand Rand Rand end}% + \definecolor[ps]{randomhsb}{hsb}{tx@Dict begin Rand Rand Rand end}% + } +% +\def\pst@getcolor#1#2{% +% \@ifundefined{color@#1}% hv 1.14 2005-12-17 + \@ifundefined{\string\color@#1}% + {\@pstrickserr{Color `#1' not defined}\@eha}% + {\edef#2{#1}}% +} +% +%% END: pstricks-color.tex +\endinput diff --git a/graphics/pstricks/base/generic/pstricks.con b/graphics/pstricks/base/generic/pstricks.con index 21134fb781..0c119d13a3 100644 --- a/graphics/pstricks/base/generic/pstricks.con +++ b/graphics/pstricks/base/generic/pstricks.con @@ -1,4 +1,4 @@ -%% $Id: pstricks.con 170 2021-09-01 09:54:41Z herbert $ +%% $Id: pstricks.con 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for dvips driver) %% %% Configuration file for PSTricks @@ -39,11 +39,8 @@ %% If you want to include your own customizations to pstricks.tex, then %% uncomment the \pstcustomize command, and include your modifications %% after \pstcustomize. These will be read in after pstricks.tex. -\pstcustomize +%\pstcustomize -\ifPSTlualatex% luatex has another coordinate system - \def\pstrotate{CP CP translate 3 -1 roll rotate \tx@NET} -\fi \endinput %% diff --git a/graphics/pstricks/base/generic/pstricks.tex b/graphics/pstricks/base/generic/pstricks.tex index cd28900b39..80005b22d0 100644 --- a/graphics/pstricks/base/generic/pstricks.tex +++ b/graphics/pstricks/base/generic/pstricks.tex @@ -81,8 +81,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{3.07} -\def\filedate{2021/09/05} +\def\fileversion{3.08} +\def\filedate{2021/09/10} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -461,7 +461,7 @@ \def\pstverbscale{}% \def\pstnodescale{}% \def\pstheader{\luaPSTheader}% - \def\c@lor@to@ps#1\@@{(#1) setpdfcolor} + \def\c@lor@to@ps#1\@@{\luaPSTcolor{#1}} % \AltClipMode % now done after the definition of \AltClipMode, see below % Not sure if we need ``neg'' here or not % \def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET} @@ -607,46 +607,10 @@ \gdef\psrbrace[} ] \endgroup % -\pstVerb{ - /pssetRGBcolor /setrgbcolor load def - /pssetCMYKcolor /setcmykcolor load def - /pssetGraycolor /setgray load def -} -\def\@newcolor#1#2{% - \expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}% - %\expandafter\edef\csname color@#1\endcsname{#2}% - \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 - \ignorespaces} % -\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% -\def\pst@endcolor{\pstVerb{\pst@currentcolor}} -\def\pst@currentcolor{0 setgray} -\def\altcolormode{% -\def\pst@color##1{% - \pstVerb{gsave ##1}\aftergroup\pst@endcolor}% -\def\pst@endcolor{\pstVerb{\pst@grestore}}} -\def\pssetMonochrome{% - \pstVerb{ - /setrgbcolor { add add 0 gt {0}{1} 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 {0}{1} ifelse setgray } def }} -\def\pssetGrayscale{% - \pstVerb{ - /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 }} -\def\psresetColor{\pstVerb{ - /setrgbcolor tx@Dict begin /pssetRGBcolor load end def - /setcmykcolor tx@Dict begin /pssetCMYKcolor load end def }} - +\input pstricks-color +% +% \def\pst@grestore{ currentpoint matrix currentmatrix @@ -656,45 +620,6 @@ setmatrix moveto } -%\def\pst@usecolor#1{\csname color@#1\endcsname\space}% hv 1.14 2005--12-17 -\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} -% -\def\newgray#1#2{% - \pst@checknum{#2}\pst@tempg - \@newcolor{#1}{\pst@tempg setgray}}% -\def\newrgbcolor#1#2{% - \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} -\def\newhsbcolor#1#2{% - \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}} -\def\newcmykcolor#1#2{% - \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}} -\newgray{black}{0} -\newgray{darkgray}{.25} -\newgray{gray}{.5} -\newgray{lightgray}{.75} -\newgray{white}{1} -\newrgbcolor{red}{1 0 0} -\newrgbcolor{green}{0 1 0} -\newrgbcolor{blue}{0 0 1} -\newrgbcolor{yellow}{1 1 0} -\newrgbcolor{cyan}{0 1 1} -\newrgbcolor{magenta}{1 0 1} - -\@ifundefined{xglobal}% do we have xcolor loaded? - {\@newcolor{randomgray}{tx@Dict begin Rand setgray end}% - \@newcolor{randomrgb}{tx@Dict begin Rand Rand Rand setrgbcolor end}% - \@newcolor{randomcmyk}{tx@Dict begin Rand Rand Rand Rand setcmykcolor end}% - \@newcolor{randomhsb}{tx@Dict begin Rand Rand Rand sethsbcolor end}% - }{% - \definecolor[ps]{randomgray}{gray}{tx@Dict begin Rand end}% - \definecolor[ps]{randomrgb}{rgb}{tx@Dict begin Rand Rand Rand end}% - \definecolor[ps]{randomcmyk}{cmyk}{tx@Dict begin Rand Rand Rand Rand end}% - \definecolor[ps]{randomhsb}{hsb}{tx@Dict begin Rand Rand Rand end}% - } -% \define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{} \define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture \psset[pstricks]{bgcolor={},draft=false}% \pst@bgcolor is \@empty @@ -726,12 +651,7 @@ %------------ hv 1.16 end ------------------- % \def\@none{none} -\def\pst@getcolor#1#2{% -% \@ifundefined{color@#1}% hv 1.14 2005-12-17 - \@ifundefined{\string\color@#1}% - {\@pstrickserr{Color `#1' not defined}\@eha}% - {\edef#2{#1}}% -} +% \newdimen\psunit \psunit 1cm \newdimen\psxunit \psxunit 1cm \newdimen\psyunit \psyunit 1cm @@ -918,10 +838,6 @@ \fi} % \def\pst@@CheckCoorType#1#2;#3;#4\@nil{% -%\typeout{====1:#1}% -%\typeout{====2:#2}% -%\typeout{====3:#3}% -%\typeout{====4:#4}% \ifx#1>\relax% node with special rotation for \uput \global\pst@C@@rType=7 \else @@ -1396,8 +1312,7 @@ { \pst@usecolor\ps@kitecolor } { \pst@usecolor\pshatchcolor } \psk@psscale - \tx@PenroseFillA -} + \tx@PenroseFillA } \def\psfs@penroseA{\pst@fill\pst@penroseFillA} \@namedef{psfs@penroseA*}{\psfs@solid \psfs@penroseA} % @@ -1445,6 +1360,7 @@ % \def\pst@flattenpath{ /Coors [] def % the array of all points + 50 dict begin /lambda \psk@startWL\space def % /add2Values { Coors aload length 2 add array astore /Coors exch def } def @@ -1509,6 +1425,7 @@ % stroke % draw the line segment % moveto % } repeat + end } % diff --git a/graphics/pstricks/base/latex/pstricks-pdf.sty b/graphics/pstricks/base/latex/pstricks-pdf.sty index 9923109fbb..8fe00f7bc7 100644 --- a/graphics/pstricks/base/latex/pstricks-pdf.sty +++ b/graphics/pstricks/base/latex/pstricks-pdf.sty @@ -1,4 +1,4 @@ -% $Id: pstricks-pdf.sty 23 2020-09-18 06:29:04Z herbert $ +% $Id: pstricks-pdf.sty 25 2020-09-18 06:59:21Z herbert $ %% %% This is file `pstricks-pdf.sty'. %% diff --git a/graphics/pstricks/contrib/pst-circ/Changes b/graphics/pstricks/contrib/pst-circ/Changes index b757a73b01..7c65cba773 100644 --- a/graphics/pstricks/contrib/pst-circ/Changes +++ b/graphics/pstricks/contrib/pst-circ/Changes @@ -1,3 +1,4 @@ +2.19 2021-09-09 fixes for use with lualatex 2.18 2021-04-28 Added new transistors: JFET (N and P channels), D-MOSFET (N and P channels), and IGBT 2.17 2020-05-26 fix for colors in xcolor notation @@ -89,4 +90,5 @@ -- pst-circ.pro --- +0.02 2021-09-09 added tx@CircDict for use in pst-circ.tex 0.01 2007-03-23 (hv) first version diff --git a/graphics/pstricks/contrib/pst-circ/Makefile b/graphics/pstricks/contrib/pst-circ/Makefile deleted file mode 100644 index 90b96655a6..0000000000 --- a/graphics/pstricks/contrib/pst-circ/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# `Makefile' for `pst-circ.pdf', hv, 2007/03/17 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = pst-circ - -MAIN = $(PACKAGE)-doc - -LATEX = latex - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -TDS = ~/PSTricks/PSTricks-TDS - -all : doc clean ctan tds -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< - if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi - if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi - makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ - $(basename $<).glo - makeindex -t $(basename $<).ilg -o $(basename $<).ind \ - $(basename $<).idx - biber $(basename $<) - $(LATEX) $< - $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl ) - $(RM) $(addprefix $(MAIN), .dvi .ps .bcf .run.xml) - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -ctan: - cp *.sty .ctan/$(PACKAGE)/latex/ - cp $(PACKAGE).tex .ctan/$(PACKAGE)/tex/ -# cp $(PACKAGE)97.tex .ctan/$(PACKAGE)/tex/ - cp *.pro .ctan/$(PACKAGE)/dvips/ -# cp more_docs/* .ctan/$(PACKAGE)/doc/ - cp $(PACKAGE)-doc.* .ctan/$(PACKAGE)/doc/ -# rm -fr .ctan/$(PACKAGE)/.svn -# - cp Changes .ctan/$(PACKAGE)/ - cp README .ctan/$(PACKAGE)/ - chmod -R a+r .ctan/$(PACKAGE) - diff --git a/graphics/pstricks/contrib/pst-circ/README b/graphics/pstricks/contrib/pst-circ/README index 529d7c28b4..8345d1524a 100644 --- a/graphics/pstricks/contrib/pst-circ/README +++ b/graphics/pstricks/contrib/pst-circ/README @@ -1,12 +1,9 @@ -If you have TeX run by a distribution then you can ignore all the -follwoing text, because verything is done by your package manager. - Save the files pst-circ.sty|tex in a directory, which is part of your local TeX tree. pst-circ.pro should be saved in ../texmf/dvips/pstricks/ Then do not forget to run texhash to update this tree. pst-circ needs pst-node and pstricks, which should be part of your local TeX installation, otherwise get it from a CTAN server, f.ex. -http://mirror.ctan.org +https://mirror.ctan.org Save the files @@ -43,9 +40,4 @@ interprete the embedded PostScript code. For another PDF output read the Introduction from the documentation. - -%% 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. - hvoss@tug.org
\ No newline at end of file diff --git a/graphics/pstricks/contrib/pst-circ/pst-circ-doc.bib b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.bib index ead359beff..ead359beff 100644 --- a/graphics/pstricks/contrib/pst-circ/pst-circ-doc.bib +++ b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.bib diff --git a/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.pdf b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.pdf Binary files differnew file mode 100644 index 0000000000..1d65756456 --- /dev/null +++ b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.pdf diff --git a/graphics/pstricks/contrib/pst-circ/pst-circ-doc.tex b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.tex index 145aed9896..d0bffb1f89 100644 --- a/graphics/pstricks/contrib/pst-circ/pst-circ-doc.tex +++ b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.tex @@ -1,6 +1,8 @@ -%% $Id: pst-circ-doc.tex 1181 2020-05-26 13:19:14Z herbert $ -\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false, - headings=small, headinclude=false,footinclude=false,oneside,abstract=on]{pst-doc} +%% $Id: pst-circ-doc.tex 210 2021-09-10 07:52:09Z herbert $ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{} +\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside,english]{pst-doc} \usepackage{amsmath,siunitx} \usepackage{pst-circ} \let\pstCircFV\fileversion @@ -75,7 +77,7 @@ Herbert Vo\ss} %\docauthor{Herbert Vo\ss} \date{\today} -\maketitle +\settitle \tableofcontents @@ -2162,7 +2164,8 @@ Since for microwave signal, the direction in which the signal spreads is very im There are dipoleinput or tripoleinput or quadripoleinput and arrowinput parameters. The value of theses parameters are left or right for the first one and true or false for second one. -\xLcs{ifPst@inputarrow}\xLcs{pcline} +%\xLcs{ifPst@inputarrow} +\xLcs{pcline} \begin{lstlisting}[style=code] \ifPst@inputarrow \ifx\psk@Dinput\pst@Dinput@right @@ -4225,7 +4228,7 @@ If you want to add a new dipole component, you only need the following code: This code can be placed in the core code or somewhere in the respective document in which case it must be surrounded by \lstinline[language=TeX]{\makeatletter...\makeatother}. If your new dipole should also work with \Lcs{multidipole} then you have to make some changes in the \Lcs{multidipole} core code. In the definition -of \Lcs{pst@multidipole}, look for the last \Lcs{ifx} test +of \nxLcs{pst@multidipole}, look for the last \nxLcs{ifx} test \begin{lstlisting}[language=TeX] % ... % Extract from \pst@multidipole diff --git a/graphics/pstricks/contrib/pst-circ/pst-circ.pro b/graphics/pstricks/contrib/pst-circ/dvips/pst-circ.pro index 57e66aef5f..b2a3062bac 100644 --- a/graphics/pstricks/contrib/pst-circ/pst-circ.pro +++ b/graphics/pstricks/contrib/pst-circ/dvips/pst-circ.pro @@ -1,10 +1,11 @@ %! -% $Id: pst-circ.pro 646 2017-11-16 09:46:12Z herbert $ +% $Id: pst-circ.pro 209 2021-09-10 06:24:23Z herbert $ % % PostScript prologue for pst-circ.tex. -% version 0.01 2007-03-23 (hv) +% version 0.02 2021-09-09 (hv) % For distribution, see pstricks.tex. % +/tx@CircDict 50 dict def % used in pst-circ.tex /GetNode { tx@NodeDict begin tx@NodeDict 1 index known { load GetCenter } { pop 0 0 } ifelse diff --git a/graphics/pstricks/contrib/pst-circ/pst-circ.sty b/graphics/pstricks/contrib/pst-circ/latex/pst-circ.sty index 3fa57ea4d6..9846890f6c 100644 --- a/graphics/pstricks/contrib/pst-circ/pst-circ.sty +++ b/graphics/pstricks/contrib/pst-circ/latex/pst-circ.sty @@ -1,11 +1,11 @@ -%% $Id: pst-circ.sty 918 2019-01-22 16:41:03Z herbert $ +%% $Id: pst-circ.sty 210 2021-09-10 07:52:09Z herbert $ \RequirePackage{pstricks} -\ProvidesPackage{pst-circ}[2019/01/22 package wrapper for +\ProvidesPackage{pst-circ}[2021/09/09 package wrapper for pst-circ.tex (hv)] \input{pst-circ.tex} \IfFileExists{pst-circ.pro}{% \ProvidesFile{pst-circ.pro} - [2007/03/23 v. 0.01, PostScript prologue file (hv)] + [2021/09/09 v. 0.02, PostScript prologue file (hv)] \@addtofilelist{pst-circ.pro}}{}% \ProvidesFile{pst-circ.tex} [\filedate\space v\fileversion\space `PST-circ' (CJ,hv)] diff --git a/graphics/pstricks/contrib/pst-circ/pst-circ-doc.pdf b/graphics/pstricks/contrib/pst-circ/pst-circ-doc.pdf Binary files differdeleted file mode 100644 index cbd5e0b4ca..0000000000 --- a/graphics/pstricks/contrib/pst-circ/pst-circ-doc.pdf +++ /dev/null diff --git a/graphics/pstricks/contrib/pst-circ/pst-circ.tex b/graphics/pstricks/contrib/pst-circ/tex/pst-circ.tex index d13be6321d..4a3e81fde0 100644 --- a/graphics/pstricks/contrib/pst-circ/pst-circ.tex +++ b/graphics/pstricks/contrib/pst-circ/tex/pst-circ.tex @@ -1,4 +1,4 @@ -%% $Id: pst-circ.tex 1181 2020-05-26 13:19:14Z herbert $ +%% $Id: pst-circ.tex 210 2021-09-10 07:52:09Z herbert $ %% This is file `pst-circ.tex' %% %% IMPORTANT NOTICE: @@ -26,8 +26,8 @@ \ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi % -\def\fileversion{2.18} -\def\filedate{2021/04/28} +\def\fileversion{2.19} +\def\filedate{2021/09/09} \message{`pst-circ' v\fileversion (hv)} % \edef\PstAtCode{\the\catcode`\@} @@ -1011,7 +1011,7 @@ \pst@getcoor{#1}\pst@tempa \pst@getcoor{#2}\pst@tempb \pst@getcoor{#3}\pst@tempc - \pnode(!% + \pnode(! 10 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def \pst@tempb /Y2 exch \pst@number\psyunit div def @@ -1020,7 +1020,7 @@ /X3 exch \pst@number\psxunit div def /XC X1 X2 lt {X3 X2} {X3 X1} ifelse add 2 div def /YC Y1 Y2 add 2 div def - XC YC){C@} + XC YC end ){C@} \rput(C@){\pst@draw@OA} \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#1}{\ifPst@OAinvert Minus@\else Plus@\fi} \ncput[npos=2]{\pnode{\ifPst@OAinvert Minus@@\else Plus@@\fi}} @@ -1085,7 +1085,7 @@ \pst@getcoor{#1}\pst@tempa \pst@getcoor{#2}\pst@tempb \pst@getcoor{#3}\pst@tempc - \pnode(!% + \pnode(! 10 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def \pst@tempb /Y2 exch \pst@number\psyunit div def @@ -1094,7 +1094,7 @@ /X3 exch \pst@number\psxunit div def /XC X1 X2 lt {X3 X2} {X3 X1} ifelse add 2 div def /YC Y1 Y2 add 2 div def - XC YC){C@} + XC YC end){C@} \rput(C@){\pst@draw@GM} \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#1}{\ifPst@GMinvert Minus@\else Plus@\fi} \ncput[npos=2]{\pnode{\ifPst@GMinvert Minus@@\else Plus@@\fi}} @@ -1177,18 +1177,18 @@ \else \pst@getcoor{#1}\pst@tempA% \pnode(! - \pst@tempA /YB exch \pst@number\psyunit div def - /XB exch \pst@number\psxunit div def + \pst@tempA /YB_t exch \pst@number\psyunit div def + /XB_t exch \pst@number\psxunit div def /basesep \Pst@basesep\space \pst@number\psxunit div def - XB basesep \Pst@TRot\space cos mul add - YB basesep \Pst@TRot\space sin mul add){TBaseNode}% base node + XB_t basesep \Pst@TRot\space cos mul add + YB_t basesep \Pst@TRot\space sin mul add){TBaseNode}% base node \fi % Base \rput[c]{\Pst@TRot}(! - \pst@tempA /YB exch \pst@number\psyunit div def - /XB exch \pst@number\psxunit div def + \pst@tempA /YB_t exch \pst@number\psyunit div def + /XB_t exch \pst@number\psxunit div def /basesep \Pst@basesep\space \pst@number\psxunit div def - XB basesep \Pst@TRot\space cos mul add - YB basesep \Pst@TRot\space sin mul add){% + XB_t basesep \Pst@TRot\space cos mul add + YB_t basesep \Pst@TRot\space sin mul add){% \ifdim180pt=\Pst@TRot pt\relax % rotate 180? \ifPst@transistorcircle\pscircle(0.3,0){0.7}\fi % circle drawing \ifx\psk@Ttype\pst@Ttype@NPN\relax % NPN @@ -1419,9 +1419,9 @@ /X3 exch \pst@number\psxunit div def /LR X1 X2 lt { false }{ true } ifelse def % change left-right /basesep \Pst@basesep\space \pst@number\psxunit div def - /XBase X1 basesep \Pst@TRot\space cos mul add def - /YBase Y1 basesep \Pst@TRot\space sin mul add def - XBase YBase ){@@base}% base node + /XB_tase X1 basesep \Pst@TRot\space cos mul add def + /YB_tase Y1 basesep \Pst@TRot\space sin mul add def + XB_tase YB_tase ){@@base}% base node % \global\Pst@temptrue% \transistor@ii(@@base){@@emitter}{@@collector}% @@ -1493,7 +1493,7 @@ \pst@getcoor{#1}\pst@tempa \pst@getcoor{#2}\pst@tempb \pst@getcoor{#3}\pst@tempc - \pnode(!% + \pnode(! 10 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def \pst@tempb /Y2 exch \pst@number\psyunit div def @@ -1502,7 +1502,7 @@ /X3 exch \pst@number\psxunit div def /XC X1 X2 add 2 div def /YC Y2 def - XC YC){C@} + XC YC end ){C@} \rput(C@){\pst@draw@Tswitch} \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tswi@left} \ncangle[arrows=-,arm=0.5,angleB=0]{#2}{Tswi@right} @@ -1524,35 +1524,35 @@ \pst@getcoor{#1}\pst@tempa \pst@getcoor{#2}\pst@tempb \pst@getcoor{#3}\pst@tempc - \pnode(!% - \pst@tempa /Y1 exch \pst@number\psyunit div def - /X1 exch \pst@number\psxunit div def - \pst@tempb /Y2 exch \pst@number\psyunit div def - /X2 exch \pst@number\psxunit div def - \pst@tempc /Y3 exch \pst@number\psyunit div def - /X3 exch \pst@number\psxunit div def - /dx X2 X1 sub def - /dy Y2 Y1 sub def - dx 2 div X1 add - dy 2 div Y1 add ){Center@} + \pnode(! tx@CircDict begin + \pst@tempa /Y1_p exch \pst@number\psyunit div def + /X1_p exch \pst@number\psxunit div def + \pst@tempb /Y2_p exch \pst@number\psyunit div def + /X2_p exch \pst@number\psxunit div def + \pst@tempc /Y3_p exch \pst@number\psyunit div def + /X3_p exch \pst@number\psxunit div def + /dx X2_p X1_p sub def + /dy Y2_p Y1_p sub def + dx 2 div X1_p add + dy 2 div Y1_p add end ){Center@} \pst@getcoor{Center@}\pst@tempd - \pnode(!% - \pst@tempd /Y4 exch \pst@number\psyunit div def - /X4 exch \pst@number\psxunit div def + \pnode(! tx@CircDict begin + \pst@tempd /Y4_p exch \pst@number\psyunit div def + /X4_p exch \pst@number\psxunit div def dx abs 0.01 lt{ - X3 Y4 + X3_p Y4_p }{dy abs 0.01 lt { - X4 Y3 + X4_p Y3_p }{/m dy dx div def - /x Y4 Y3 sub m X3 mul add X4 m div add m 1 m div add div def - x dup X3 sub m mul Y3 add + /x_p Y4_p Y3_p sub m X3_p mul add X4_p m div add m 1 m div add div def + x_p dup X3_p sub m mul Y3_p add } ifelse - }ifelse){@tempNodeB} - \pnode(!% + }ifelse end ){@tempNodeB} + \pnode(! tx@CircDict begin /Alpha dy dx atan def /dx Alpha sin 0.25 mul def /dy Alpha cos 0.25 mul def - Y3 Y2 gt {X4 dx sub Y4 dy add}{X4 dx add Y4 dy sub}ifelse ){@tempNodeC} + Y3_p Y2_p gt { X4_p dx sub Y4_p dy add}{X4_p dx add Y4_p dy sub}ifelse end ){@tempNodeC} \psline[arrows=->,arrowsize=0.2](#3)(@tempNodeB)(@tempNodeC) \pcline[linestyle=none](#1)(#3)% for the endarrows \end@ClosedObj% @@ -1578,7 +1578,7 @@ \pst@getcoor{#2}\pst@tempB \pst@getcoor{#3}\pst@tempC \pst@getcoor{#4}\pst@tempD - \pnode(!% + \pnode(! 10 dict begin \pst@tempA /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def \pst@tempB /Y2 exch \pst@number\psyunit div def @@ -1589,7 +1589,7 @@ /X4 exch \pst@number\psxunit div def /XC X1 X2 lt {X2} {X1} ifelse X3 X4 lt {X3} {X4} ifelse add 2 div def /YC Y1 Y3 lt {Y1} {Y3} ifelse Y2 Y4 lt {Y2} {Y4} ifelse add 2 div def - XC YC){C@} + XC YC end){C@} \rput(C@){\pst@draw@transformer} \pnode(#1){@endA}\pnode(#2){@endB}\pnode(#3){@endC}\pnode(#4){@endD}% \ncangle[arrows=-,arm=0.5,angleB=90]{@endA}{inup@} @@ -1627,7 +1627,7 @@ \pst@getcoor{#2}\pst@tempb \pst@getcoor{#3}\pst@tempc \pst@getcoor{#4}\pst@tempd - \pnode(!% + \pnode(! 10 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def \pst@tempb /Y2 exch \pst@number\psyunit div def @@ -1638,7 +1638,7 @@ /X4 exch \pst@number\psxunit div def /XC X1 X2 lt {X2} {X1} ifelse X3 X4 lt {X3} {X4} ifelse add 2 div def /YC Y1 Y3 lt {Y1} {Y3} ifelse Y2 Y4 lt {Y2} {Y4} ifelse add 2 div def - XC YC){C@} + XC YC end){C@} \rput(C@){\pst@draw@optoCoupler} \ncangle[arrows=-,arm=0.5,angleB=90]{#1}{inup@} \ncangle[arrows=-,arm=0.5,angleB=-90]{#2}{indown@} @@ -1660,7 +1660,7 @@ \pst@getcoor{#2}\pst@tempb \pst@getcoor{#3}\pst@tempc \pst@getcoor{#4}\pst@tempd - \pnode(!% + \pnode(! 10 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def \pst@tempb /Y2 exch \pst@number\psyunit div def @@ -1671,7 +1671,7 @@ /X4 exch \pst@number\psxunit div def /XC X1 X2 lt {X2} {X1} ifelse X3 X4 lt {X3} {X4} ifelse add 2 div def /YC Y1 Y3 lt {Y1} {Y3} ifelse Y2 Y4 lt {Y2} {Y4} ifelse add 2 div def - XC YC){C@} + XC YC end){C@} \rput(C@){#5} \rput(C@){\psframe[linewidth=1.5\pslinewidth](-1.5,-1.2)(1.5,1.2) \pnode(-1.5,1){inup@} \pnode(-1.5,-1){indown@} @@ -2401,73 +2401,73 @@ \pst@getcoor{#2}\pst@tempa \ifPst@logicChangeLR\def\logic@LR{true}\else\def\logic@LR{false}\fi \pstVerb{ - /YA \pst@tempa exch pop \pst@number\psyunit div def - /YB YA \psk@logic@height\space add def + /YA_log \pst@tempa exch pop \pst@number\psyunit div def + /YB_log YA_log \psk@logic@height\space add def \logic@LR {% - /XB \pst@tempa pop \pst@number\psxunit div def - /XA XB \psk@logic@width\space add def + /XB_log \pst@tempa pop \pst@number\psxunit div def + /XA_log XB_log \psk@logic@width\space add def }{% - /XA \pst@tempa pop \pst@number\psxunit div def - /XB XA \psk@logic@width\space add def + /XA_log \pst@tempa pop \pst@number\psxunit div def + /XB_log XA_log \psk@logic@width\space add def } ifelse - /dy YB YA sub def + /dy YB_log YA_log sub def } \ifx\psk@logic@type\pst@logic@type@RS%---------------- RS ----------------- - \pnode(! XA YA dy 4 div add){#3S} - \pnode(! XA YA dy 4 div 3 mul add){#3R} - \psline(#3R)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 4 div 3 mul add) - \psline(#3S)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 4 div add) + \pnode(! XA_log YA_log dy 4 div add){#3S} + \pnode(! XA_log YA_log dy 4 div 3 mul add){#3R} + \psline(#3R)(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 4 div 3 mul add) + \psline(#3S)(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 4 div add) \uput[\ifPst@logicChangeLR 180\else 0\fi](#3R){\psk@logic@nodestyle R} \uput[\ifPst@logicChangeLR 180\else 0\fi](#3S){\psk@logic@nodestyle S} - \pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 4 div add){#3Qneg} - \pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 4 div add){0.1} - \pnode(! XB YA dy 4 div 3 mul add){#3Q} - \psline(#3Q)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add) - \psline(#3Qneg)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 4 div add) + \pnode(! XB_log 0.2 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){#3Qneg} + \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){0.1} + \pnode(! XB_log YA_log dy 4 div 3 mul add){#3Q} + \psline(#3Q)(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 4 div 3 mul add) + \psline(#3Qneg)(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 4 div add) \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q} \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$} \ifPst@logicShowDot - \qdisk(! XA \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YA dy 4 div 3 mul add){3pt} - \qdisk(! XA \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YA dy 4 div add){3pt} - \qdisk(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt} - \qdisk(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 4 div add){3pt} + \qdisk(! XA_log \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YA_log dy 4 div 3 mul add){3pt} + \qdisk(! XA_log \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YA_log dy 4 div add){3pt} + \qdisk(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 4 div 3 mul add){3pt} + \qdisk(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 4 div add){3pt} \fi \rput[b](!% - /dx XB XA sub 2 div def - XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} + /dx XB_log XA_log sub 2 div def + XA_log dx add YA_log 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} \else \ifx\psk@logic@type\pst@logic@type@D%---------------- D ----------------- - \pnode(! XA YA dy 2 div add){#3C} - \pnode(! XA YA dy 4 div 3 mul add){#3D} - \psline(#3D)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 4 div 3 mul add) - \psline(#3C)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add) - \psline[linewidth=0.5pt](! XA YA dy 2 div add 0.15 add) - (! XA 0.4 \logic@LR {sub}{add} ifelse YA dy 2 div add)(! XA YA dy 2 div add 0.15 sub) + \pnode(! XA_log YA_log dy 2 div add){#3C} + \pnode(! XA_log YA_log dy 4 div 3 mul add){#3D} + \psline(#3D)(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 4 div 3 mul add) + \psline(#3C)(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 2 div add) + \psline[linewidth=0.5pt](! XA_log YA_log dy 2 div add 0.15 add) + (! XA_log 0.4 \logic@LR {sub}{add} ifelse YA_log dy 2 div add)(! XA_log YA_log dy 2 div add 0.15 sub) \uput[\ifPst@logicChangeLR 180\else 0\fi](#3D){\psk@logic@nodestyle D} \uput{0.5}[\ifPst@logicChangeLR 180\else 0\fi](#3C){\psk@logic@nodestyle C} - \pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 4 div add){#3Qneg} - \pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 4 div add){0.1} - \pnode(! XB YA dy 4 div 3 mul add){#3Q} - \psline(#3Q)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add) - \psline(#3Qneg)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div add) + \pnode(! XB_log 0.2 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){#3Qneg} + \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){0.1} + \pnode(! XB_log YA_log dy 4 div 3 mul add){#3Q} + \psline(#3Q)(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div 3 mul add) + \psline(#3Qneg)(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div add) \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q} \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$} \ifPst@logicShowDot - \qdisk(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 4 div 3 mul add){3pt} - \qdisk(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add){3pt} - \qdisk(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt} - \qdisk(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div add){3pt} + \qdisk(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 4 div 3 mul add){3pt} + \qdisk(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 2 div add){3pt} + \qdisk(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div 3 mul add){3pt} + \qdisk(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){3pt} \fi \rput[b](!% - /dx XB XA sub 2 div def - XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} + /dx XB_log XA_log sub 2 div def + XA_log dx add YA_log 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} \else \ifx\psk@logic@type\pst@logic@type@JK%---------------- JK ----------------- \multido{\n=1+1}{\psk@logic@JInput}{% \pnode(!% /Step dy 2 div \psk@logic@JInput\space div def /yNew Step \n\space mul def - XA YA yNew add Step 2 div sub){#3J\n} + XA_log YA_log yNew add Step 2 div sub){#3J\n} \pst@getcoor{#3J\n}\pst@tempc \uput[\ifPst@logicChangeLR 180\else 0\fi](#3J\n){\psk@logic@nodestyle J\n} \pnode(! @@ -2483,7 +2483,7 @@ \pnode(!% /Step dy 2 div \psk@logic@KInput\space div def /yNew Step \n\space mul def - XA YB yNew sub Step 2 div add){#3K\n} + XA_log YB_log yNew sub Step 2 div add){#3K\n} \pst@getcoor{#3K\n}\pst@tempc \uput[\ifPst@logicChangeLR 180\else 0\fi](#3K\n){\psk@logic@nodestyle K\n} \pnode(! @@ -2495,33 +2495,33 @@ \qdisk(tempK\n){3pt} \fi } - \psline[linewidth=0.5pt](! XA YA dy 2 div add 0.15 add) - (! XA 0.4 \logic@LR {sub}{add} ifelse YA dy 2 div add)(! XA YA dy 2 div add 0.15 sub) - \pnode(! XA YA dy 2 div add){#3C} - \psline(#3C)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add) + \psline[linewidth=0.5pt](! XA_log YA_log dy 2 div add 0.15 add) + (! XA_log 0.4 \logic@LR {sub}{add} ifelse YA_log dy 2 div add)(! XA_log YA_log dy 2 div add 0.15 sub) + \pnode(! XA_log YA_log dy 2 div add){#3C} + \psline(#3C)(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 2 div add) \uput{0.5}[\ifPst@logicChangeLR 180\else 0\fi](#3C){\psk@logic@nodestyle C} - \pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 4 div add){#3Qneg} - \pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 4 div add){0.1} - \pnode(! XB YA dy 4 div 3 mul add){#3Q} - \psline(#3Q)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add) - \psline(#3Qneg)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div add) + \pnode(! XB_log 0.2 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){#3Qneg} + \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){0.1} + \pnode(! XB_log YA_log dy 4 div 3 mul add){#3Q} + \psline(#3Q)(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div 3 mul add) + \psline(#3Qneg)(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div add) \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q} \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$} \ifPst@logicShowDot - \qdisk(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt} - \qdisk(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div add){3pt} - \qdisk(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add){3pt} + \qdisk(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div 3 mul add){3pt} + \qdisk(! XB_log 0.5 \logic@LR {sub}{add} ifelse YA_log dy 4 div add){3pt} + \qdisk(! XA_log 0.5 \logic@LR {add}{sub} ifelse YA_log dy 2 div add){3pt} \fi \rput[b](!% - /dx XB XA sub 2 div def - XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} + /dx XB_log XA_log sub 2 div def + XA_log dx add YA_log 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} \else%---------------- default AND/NAND/OR/NOR/NOT/EXOR/ENOR ----------------- \ifx\psk@logic@type\pst@logic@type@not \def\@nMax{1}\else \def\@nMax{\psk@logic@nInput}\fi \multido{\n=1+1}{\@nMax}{% \pnode(!% /Step dy \psk@logic@nInput\space div def /yNew Step \n\space mul def - XA YA yNew add \@nMax\space 1 gt {Step 2 div sub} if){#3\n} + XA_log YA_log yNew add \@nMax\space 1 gt {Step 2 div sub} if){#3\n} \pst@getcoor{#3\n}\pst@tempc \pnode(! /YC \pst@tempc exch pop \pst@number\psyunit div def @@ -2537,10 +2537,10 @@ \ifx\psk@logic@type\pst@logic@type@nand\else \ifx\psk@logic@type\pst@logic@type@nor\else \ifx\psk@logic@type\pst@logic@type@exnor\else - \pnode(! XB YA dy 2 div add){#3Q} - \psline(#3Q)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add)% output + \pnode(! XB_log YA_log dy 2 div add){#3Q} + \psline(#3Q)(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 2 div add)% output \ifPst@logicShowDot - \qdisk(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add){3pt} + \qdisk(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 2 div add){3pt} \fi \ifPst@logicShowNode \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q} @@ -2552,11 +2552,11 @@ \ifx\psk@logic@type\pst@logic@type@and\else% NotX output \ifx\psk@logic@type\pst@logic@type@or\else \ifx\psk@logic@type\pst@logic@type@exor\else - \pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 2 div add){#3Q} - \pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 2 div add){0.1} - \psline(#3Q)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add)% output + \pnode(! XB_log 0.2 \logic@LR {sub}{add} ifelse YA_log dy 2 div add){#3Q} + \pscircle[linewidth=0.5pt](! XB_log 0.1 \logic@LR {sub}{add} ifelse YA_log dy 2 div add){0.1} + \psline(#3Q)(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 2 div add)% output \ifPst@logicShowDot - \qdisk(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add){3pt} + \qdisk(! XB_log \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA_log dy 2 div add){3pt} \fi \ifPst@logicShowNode \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q} @@ -2590,11 +2590,11 @@ \fi \fi \rput(!% - /dx XB XA sub \psk@logic@symbolpos\space mul def - XA dx add YB 0.3 sub){\if$\psk@logic@symbolstyle$\else\psk@logic@symbolstyle\textbf{\logic@type}\fi} + /dx XB_log XA_log sub \psk@logic@symbolpos\space mul def + XA_log dx add YB_log 0.3 sub){\if$\psk@logic@symbolstyle$\else\psk@logic@symbolstyle\textbf{\logic@type}\fi} \rput[b](!% - /dx XB XA sub 2 div def - XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} + /dx XB_log XA_log sub 2 div def + XA_log dx add YA_log 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi} \fi \fi \fi% end of no special RS/JK/D @@ -2772,18 +2772,18 @@ \psframe(-0.15,-0.3)(0.15,0.3) \psline(0.2,-0.35)(0.2,0.35) \else - \pscurve[linewidth=1.5\pslinewidth]{c-c}(-0.3,0.000)(-0.225,0.088375)(-0.15,0.1250)(-0.075,0.088375)% - (0,0.000)(0.075,-0.088375)(0.15,-0.125)(0.225,-0.088375)(0.3,0.000) + \pscurve[linewidth=1.5\pslinewidth]{cc}(-0.3,0.000)(-0.225,0.088375)(-0.15,0.1250)(-0.075,0.088375)% + (0,0.000)(0.075,-0.088375)(0.15,-0.125)(0.225,-0.088375)(0.3,0.000) \fi \ifx\psk@LOoutput\pst@LOoutput@left \pst@getcoor{#3}\pst@tempa - \pnode(!% + \pnode(! 5 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def /XC X1 def /YC Y1 -0.6 add def - XC YC){C@} - \rput[t]{#2}(C@){#4} + XC YC end){C@osciA} + \rput[t]{#2}(C@osciA){#4} \ifPst@inputarrow \psline[arrows=->,arrowinset=0](-0.5,0)(-1,0) \else @@ -2792,13 +2792,13 @@ \fi \ifx\psk@LOoutput\pst@LOoutput@top \pst@getcoor{#3}\pst@tempa - \pnode(!% + \pnode(! 5 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def /XC X1 def /YC Y1 -0.6 add def - XC YC){C@} - \rput[t]{#2}(C@){#4} + XC YC end ){C@osciB} + \rput[t]{#2}(C@osciB){#4} \ifPst@inputarrow \psline[arrows=->,arrowinset=0](0,0.5)(0,1) \else @@ -2807,13 +2807,13 @@ \fi \ifx\psk@LOoutput\pst@LOoutput@right \pst@getcoor{#3}\pst@tempa - \pnode(!% + \pnode(! 5 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def /XC X1 def /YC Y1 -0.6 add def - XC YC){C@} - \rput[t]{#2}(C@){#4} + XC YC end){C@osciC} + \rput[t]{#2}(C@osciC){#4} \ifPst@inputarrow \psline[arrows=->,arrowinset=0](0.5,0)(1,0) \else @@ -2822,21 +2822,21 @@ \fi \ifx\psk@LOoutput\pst@LOoutput@bottom \pst@getcoor{#3}\pst@tempa - \pnode(!% + \pnode(! 5 dict begin \pst@tempa /Y1 exch \pst@number\psyunit div def /X1 exch \pst@number\psxunit div def /XC X1 def /YC Y1 0.6 add def - XC YC){C@} - \rput[b]{#2}(C@){#4} + XC YC end){C@osciD} + \rput[b]{#2}(C@osciD){#4} \ifPst@inputarrow \psline[arrows=->,arrowinset=0](0,-0.5)(0,-1) \else \psline(0,-0.5)(0,-1) \fi \fi - }}% - \ignorespaces% + } + }\ignorespaces } % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5441,14 +5441,14 @@ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@vac \pst@getcoor{#2}\pst@tempa \pst@getcoor{#3}\pst@tempb - \rput(! % + \rput(! 5 dict begin \pst@tempa \pst@number{\psyunit} div /YA ED \pst@number{\psxunit} div /XA ED \pst@tempb \pst@number{\psyunit} div /YB ED \pst@number{\psxunit} div /XB ED XA XB add 2 div YA YB add 2 div - ){\pscurve(-0.25,0)(-0.125,0.25)(0.125,-0.25)(0.25,0)}}\ignorespaces} + end ){\pscurve(-0.25,0)(-0.125,0.25)(0.125,-0.25)(0.25,0)}}\ignorespaces} % \def\pst@draw@vac{{% \pnode(-0.5,0){dipole@1} diff --git a/graphics/pstricks/contrib/pstricks-add/Changes b/graphics/pstricks/contrib/pstricks-add/Changes index 7e823b1d6e..90a2834f06 100644 --- a/graphics/pstricks/contrib/pstricks-add/Changes +++ b/graphics/pstricks/contrib/pstricks-add/Changes @@ -32,6 +32,7 @@ pstricks-add.pro ----------- pstricks-add.sty ----------- (hv) + v. 0.17 2021-09-10 move \psRiemann into the tex file v. 0.16 2018-02-04 use \pscalculate from package pst-calculate v. 0.15 2018-02-03 added \psCalc from xpl3 (only for latex) v. 0.14 2010-02-11 move pst-fp message into pstricks.sty @@ -41,6 +42,8 @@ pstricks-add.sty ----------- (hv) pstricks-add.tex ----------- (hv) + v 3.90 2021-09-10 - changes for using package with lualatex + - fix \psOLympicRings v 3.89a 2020-02-12 - modified documentation for \psbrace v 3.89 2019-11-01 - added otion sngleline for \psbrace v 3.88 2019-05-11 - fix for a trailing space after \psrotatet diff --git a/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.eps b/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.eps deleted file mode 100644 index 6dc4b2a804..0000000000 --- a/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.eps +++ /dev/null @@ -1,1811 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%Produced by poppler pdftops version: 0.44.0 (http://poppler.freedesktop.org) -%%Creator: TeX -%%LanguageLevel: 2 -%%DocumentSuppliedResources: (atend) -%%BoundingBox: 0 0 249 118 -%%HiResBoundingBox: 0 0 249 118 -%%DocumentSuppliedResources: (atend) -%%EndComments -%%BeginProlog -%%BeginResource: procset xpdf 3.00 0 -%%Copyright: Copyright 1996-2011 Glyph & Cog, LLC -/xpdf 75 dict def xpdf begin -% PDF special state -/pdfDictSize 15 def -/pdfSetup { - /setpagedevice where { - pop 2 dict begin - /Policies 1 dict dup begin /PageSize 6 def end def - { /Duplex true def } if - currentdict end setpagedevice - } { - pop - } ifelse -} def -/pdfSetupPaper { - % Change paper size, but only if different from previous paper size otherwise - % duplex fails. PLRM specifies a tolerance of 5 pts when matching paper size - % so we use the same when checking if the size changes. - /setpagedevice where { - pop currentpagedevice - /PageSize known { - 2 copy - currentpagedevice /PageSize get aload pop - exch 4 1 roll - sub abs 5 gt - 3 1 roll - sub abs 5 gt - or - } { - true - } ifelse - { - 2 array astore - 2 dict begin - /PageSize exch def - /ImagingBBox null def - currentdict end - setpagedevice - } { - pop pop - } ifelse - } { - pop - } ifelse -} def -/pdfStartPage { - pdfDictSize dict begin - /pdfFillCS [] def - /pdfFillXform {} def - /pdfStrokeCS [] def - /pdfStrokeXform {} def - /pdfFill [0] def - /pdfStroke [0] def - /pdfFillOP false def - /pdfStrokeOP false def - /pdfLastFill false def - /pdfLastStroke false def - /pdfTextMat [1 0 0 1 0 0] def - /pdfFontSize 0 def - /pdfCharSpacing 0 def - /pdfTextRender 0 def - /pdfPatternCS false def - /pdfTextRise 0 def - /pdfWordSpacing 0 def - /pdfHorizScaling 1 def - /pdfTextClipPath [] def -} def -/pdfEndPage { end } def -% PDF color state -/cs { /pdfFillXform exch def dup /pdfFillCS exch def - setcolorspace } def -/CS { /pdfStrokeXform exch def dup /pdfStrokeCS exch def - setcolorspace } def -/sc { pdfLastFill not { pdfFillCS setcolorspace } if - dup /pdfFill exch def aload pop pdfFillXform setcolor - /pdfLastFill true def /pdfLastStroke false def } def -/SC { pdfLastStroke not { pdfStrokeCS setcolorspace } if - dup /pdfStroke exch def aload pop pdfStrokeXform setcolor - /pdfLastStroke true def /pdfLastFill false def } def -/op { /pdfFillOP exch def - pdfLastFill { pdfFillOP setoverprint } if } def -/OP { /pdfStrokeOP exch def - pdfLastStroke { pdfStrokeOP setoverprint } if } def -/fCol { - pdfLastFill not { - pdfFillCS setcolorspace - pdfFill aload pop pdfFillXform setcolor - pdfFillOP setoverprint - /pdfLastFill true def /pdfLastStroke false def - } if -} def -/sCol { - pdfLastStroke not { - pdfStrokeCS setcolorspace - pdfStroke aload pop pdfStrokeXform setcolor - pdfStrokeOP setoverprint - /pdfLastStroke true def /pdfLastFill false def - } if -} def -% build a font -/pdfMakeFont { - 4 3 roll findfont - 4 2 roll matrix scale makefont - dup length dict begin - { 1 index /FID ne { def } { pop pop } ifelse } forall - /Encoding exch def - currentdict - end - definefont pop -} def -/pdfMakeFont16 { - exch findfont - dup length dict begin - { 1 index /FID ne { def } { pop pop } ifelse } forall - /WMode exch def - currentdict - end - definefont pop -} def -% graphics state operators -/q { gsave pdfDictSize dict begin } def -/Q { - end grestore - /pdfLastFill where { - pop - pdfLastFill { - pdfFillOP setoverprint - } { - pdfStrokeOP setoverprint - } ifelse - } if -} def -/cm { concat } def -/d { setdash } def -/i { setflat } def -/j { setlinejoin } def -/J { setlinecap } def -/M { setmiterlimit } def -/w { setlinewidth } def -% path segment operators -/m { moveto } def -/l { lineto } def -/c { curveto } def -/re { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto - neg 0 rlineto closepath } def -/h { closepath } def -% path painting operators -/S { sCol stroke } def -/Sf { fCol stroke } def -/f { fCol fill } def -/f* { fCol eofill } def -% clipping operators -/W { clip newpath } def -/W* { eoclip newpath } def -/Ws { strokepath clip newpath } def -% text state operators -/Tc { /pdfCharSpacing exch def } def -/Tf { dup /pdfFontSize exch def - dup pdfHorizScaling mul exch matrix scale - pdfTextMat matrix concatmatrix dup 4 0 put dup 5 0 put - exch findfont exch makefont setfont } def -/Tr { /pdfTextRender exch def } def -/Tp { /pdfPatternCS exch def } def -/Ts { /pdfTextRise exch def } def -/Tw { /pdfWordSpacing exch def } def -/Tz { /pdfHorizScaling exch def } def -% text positioning operators -/Td { pdfTextMat transform moveto } def -/Tm { /pdfTextMat exch def } def -% text string operators -/xyshow where { - pop - /xyshow2 { - dup length array - 0 2 2 index length 1 sub { - 2 index 1 index 2 copy get 3 1 roll 1 add get - pdfTextMat dtransform - 4 2 roll 2 copy 6 5 roll put 1 add 3 1 roll dup 4 2 roll put - } for - exch pop - xyshow - } def -}{ - /xyshow2 { - currentfont /FontType get 0 eq { - 0 2 3 index length 1 sub { - currentpoint 4 index 3 index 2 getinterval show moveto - 2 copy get 2 index 3 2 roll 1 add get - pdfTextMat dtransform rmoveto - } for - } { - 0 1 3 index length 1 sub { - currentpoint 4 index 3 index 1 getinterval show moveto - 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get - pdfTextMat dtransform rmoveto - } for - } ifelse - pop pop - } def -} ifelse -/cshow where { - pop - /xycp { - 0 3 2 roll - { - pop pop currentpoint 3 2 roll - 1 string dup 0 4 3 roll put false charpath moveto - 2 copy get 2 index 2 index 1 add get - pdfTextMat dtransform rmoveto - 2 add - } exch cshow - pop pop - } def -}{ - /xycp { - currentfont /FontType get 0 eq { - 0 2 3 index length 1 sub { - currentpoint 4 index 3 index 2 getinterval false charpath moveto - 2 copy get 2 index 3 2 roll 1 add get - pdfTextMat dtransform rmoveto - } for - } { - 0 1 3 index length 1 sub { - currentpoint 4 index 3 index 1 getinterval false charpath moveto - 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get - pdfTextMat dtransform rmoveto - } for - } ifelse - pop pop - } def -} ifelse -/Tj { - fCol - 0 pdfTextRise pdfTextMat dtransform rmoveto - currentpoint 4 2 roll - pdfTextRender 1 and 0 eq { - 2 copy xyshow2 - } if - pdfTextRender 3 and dup 1 eq exch 2 eq or { - 3 index 3 index moveto - 2 copy - currentfont /FontType get 3 eq { fCol } { sCol } ifelse - xycp currentpoint stroke moveto - } if - pdfTextRender 4 and 0 ne { - 4 2 roll moveto xycp - /pdfTextClipPath [ pdfTextClipPath aload pop - {/moveto cvx} - {/lineto cvx} - {/curveto cvx} - {/closepath cvx} - pathforall ] def - currentpoint newpath moveto - } { - pop pop pop pop - } ifelse - 0 pdfTextRise neg pdfTextMat dtransform rmoveto -} def -/TJm { 0.001 mul pdfFontSize mul pdfHorizScaling mul neg 0 - pdfTextMat dtransform rmoveto } def -/TJmV { 0.001 mul pdfFontSize mul neg 0 exch - pdfTextMat dtransform rmoveto } def -/Tclip { pdfTextClipPath cvx exec clip newpath - /pdfTextClipPath [] def } def -/Tclip* { pdfTextClipPath cvx exec eoclip newpath - /pdfTextClipPath [] def } def -% Level 2/3 image operators -/pdfImBuf 100 string def -/pdfImStr { - 2 copy exch length lt { - 2 copy get exch 1 add exch - } { - () - } ifelse -} def -/skipEOD { - { currentfile pdfImBuf readline - not { pop exit } if - (%-EOD-) eq { exit } if } loop -} def -/pdfIm { image skipEOD } def -/pdfImM { fCol imagemask skipEOD } def -/pr { 2 index 2 index 3 2 roll putinterval 4 add } def -/pdfImClip { - gsave - 0 2 4 index length 1 sub { - dup 4 index exch 2 copy - get 5 index div put - 1 add 3 index exch 2 copy - get 3 index div put - } for - pop pop rectclip -} def -/pdfImClipEnd { grestore } def -% shading operators -/colordelta { - false 0 1 3 index length 1 sub { - dup 4 index exch get 3 index 3 2 roll get sub abs 0.004 gt { - pop true - } if - } for - exch pop exch pop -} def -/funcCol { func n array astore } def -/funcSH { - dup 0 eq { - true - } { - dup 6 eq { - false - } { - 4 index 4 index funcCol dup - 6 index 4 index funcCol dup - 3 1 roll colordelta 3 1 roll - 5 index 5 index funcCol dup - 3 1 roll colordelta 3 1 roll - 6 index 8 index funcCol dup - 3 1 roll colordelta 3 1 roll - colordelta or or or - } ifelse - } ifelse - { - 1 add - 4 index 3 index add 0.5 mul exch 4 index 3 index add 0.5 mul exch - 6 index 6 index 4 index 4 index 4 index funcSH - 2 index 6 index 6 index 4 index 4 index funcSH - 6 index 2 index 4 index 6 index 4 index funcSH - 5 3 roll 3 2 roll funcSH pop pop - } { - pop 3 index 2 index add 0.5 mul 3 index 2 index add 0.5 mul - funcCol sc - dup 4 index exch mat transform m - 3 index 3 index mat transform l - 1 index 3 index mat transform l - mat transform l pop pop h f* - } ifelse -} def -/axialCol { - dup 0 lt { - pop t0 - } { - dup 1 gt { - pop t1 - } { - dt mul t0 add - } ifelse - } ifelse - func n array astore -} def -/axialSH { - dup 0 eq { - true - } { - dup 8 eq { - false - } { - 2 index axialCol 2 index axialCol colordelta - } ifelse - } ifelse - { - 1 add 3 1 roll 2 copy add 0.5 mul - dup 4 3 roll exch 4 index axialSH - exch 3 2 roll axialSH - } { - pop 2 copy add 0.5 mul - axialCol sc - exch dup dx mul x0 add exch dy mul y0 add - 3 2 roll dup dx mul x0 add exch dy mul y0 add - dx abs dy abs ge { - 2 copy yMin sub dy mul dx div add yMin m - yMax sub dy mul dx div add yMax l - 2 copy yMax sub dy mul dx div add yMax l - yMin sub dy mul dx div add yMin l - h f* - } { - exch 2 copy xMin sub dx mul dy div add xMin exch m - xMax sub dx mul dy div add xMax exch l - exch 2 copy xMax sub dx mul dy div add xMax exch l - xMin sub dx mul dy div add xMin exch l - h f* - } ifelse - } ifelse -} def -/radialCol { - dup t0 lt { - pop t0 - } { - dup t1 gt { - pop t1 - } if - } ifelse - func n array astore -} def -/radialSH { - dup 0 eq { - true - } { - dup 8 eq { - false - } { - 2 index dt mul t0 add radialCol - 2 index dt mul t0 add radialCol colordelta - } ifelse - } ifelse - { - 1 add 3 1 roll 2 copy add 0.5 mul - dup 4 3 roll exch 4 index radialSH - exch 3 2 roll radialSH - } { - pop 2 copy add 0.5 mul dt mul t0 add - radialCol sc - encl { - exch dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - 0 360 arc h - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - 360 0 arcn h f - } { - 2 copy - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a1 a2 arcn - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a2 a1 arcn h - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a1 a2 arc - dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add - a2 a1 arc h f - } ifelse - } ifelse -} def -end -%%EndResource -%%EndProlog -%%BeginSetup -xpdf begin -%%EndSetup -pdfStartPage -%%EndPageSetup -[] 0 d -1 i -0 j -0 J -10 M -1 w -/DeviceGray {} cs -[0] sc -/DeviceGray {} CS -[0] SC -false op -false OP -{} settransfer -0 0 249 118 re -W -q -q -[1 0 0 1 -3 -7] cm -q -[1 0 0 1 0 0] cm -0 0 255.12 127.56 re -W -q -[1 0 0 1 72 55.559] cm -[1 0 0 1 -85.039 0] cm -q -[1 0 0 1 13.039 -55.559] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -339.336 370.188 m -339.336 370.188 l -339.336 455.371 270.277 524.43 185.094 524.43 c -99.9102 524.43 30.8477 455.371 30.8477 370.188 c -30.8477 285.004 99.9102 215.941 185.094 215.941 c -270.277 215.941 339.336 285.004 339.336 370.188 c -h -S -6.17008 w -/DeviceGray {} CS -[1] SC -357.848 370.188 m -357.848 370.188 l -357.848 465.594 280.5 542.941 185.094 542.941 c -89.6875 542.941 12.3398 465.594 12.3398 370.188 c -12.3398 274.781 89.6875 197.434 185.094 197.434 c -280.5 197.434 357.848 274.781 357.848 370.188 c -h -S -320.828 370.188 m -320.828 370.188 l -320.828 445.148 260.055 505.922 185.094 505.922 c -110.133 505.922 49.3594 445.148 49.3594 370.188 c -49.3594 295.227 110.133 234.453 185.094 234.453 c -260.055 234.453 320.828 295.227 320.828 370.188 c -h -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -[1 0 0 1 -42.52 -38.976] cm -q -[1 0 0 1 -29.48 -16.583] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -524.43 200.516 m -524.43 200.516 l -524.43 285.699 455.371 354.762 370.188 354.762 c -285.004 354.762 215.941 285.699 215.941 200.516 c -215.941 115.332 285.004 46.2734 370.188 46.2734 c -455.371 46.2734 524.43 115.332 524.43 200.516 c -h -S -6.17008 w -/DeviceGray {} CS -[1] SC -542.941 200.516 m -542.941 200.516 l -542.941 295.922 465.594 373.27 370.188 373.27 c -274.781 373.27 197.434 295.922 197.434 200.516 c -197.434 105.109 274.781 27.7617 370.188 27.7617 c -465.594 27.7617 542.941 105.109 542.941 200.516 c -h -S -505.922 200.516 m -505.922 200.516 l -505.922 275.477 445.148 336.254 370.188 336.254 c -295.227 336.254 234.453 275.477 234.453 200.516 c -234.453 125.555 295.227 64.7813 370.188 64.7813 c -445.148 64.7813 505.922 125.555 505.922 200.516 c -h -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 -85.039 0] cm -q -[1 0 0 1 13.039 -55.559] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -318.672 293.063 m -332.207 316.508 339.336 343.113 339.336 370.188 c -339.336 397.262 332.207 423.863 318.672 447.309 c -S -6.17008 w -/DeviceGray {} CS -[1] SC -334.703 283.809 m -349.863 310.07 357.848 339.863 357.848 370.188 c -357.848 400.512 349.863 430.305 334.703 456.563 c -S -302.645 302.316 m -314.555 322.949 320.828 346.363 320.828 370.188 c -320.828 394.012 314.555 417.422 302.645 438.055 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[1 0 0 1 -72 -55.559] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceGray {} CS -[0] SC -709.523 370.188 m -709.523 370.188 l -709.523 455.371 640.461 524.43 555.277 524.43 c -470.094 524.43 401.035 455.371 401.035 370.188 c -401.035 285.004 470.094 215.941 555.277 215.941 c -640.461 215.941 709.523 285.004 709.523 370.188 c -h -S -6.17008 w -/DeviceGray {} CS -[1] SC -728.031 370.188 m -728.031 370.188 l -728.031 465.594 650.684 542.941 555.277 542.941 c -459.871 542.941 382.523 465.594 382.523 370.188 c -382.523 274.781 459.871 197.434 555.277 197.434 c -650.684 197.434 728.031 274.781 728.031 370.188 c -h -S -691.016 370.188 m -691.016 370.188 l -691.016 445.148 630.238 505.922 555.277 505.922 c -480.316 505.922 419.543 445.148 419.543 370.188 c -419.543 295.227 480.316 234.453 555.277 234.453 c -630.238 234.453 691.016 295.227 691.016 370.188 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 -38.976] cm -q -[1 0 0 1 -29.48 -16.583] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -503.766 277.641 m -476.215 325.363 425.289 354.762 370.188 354.762 c -S -6.17008 w -/DeviceGray {} CS -[1] SC -519.793 286.895 m -488.938 340.34 431.902 373.27 370.188 373.27 c -S -487.738 268.387 m -463.492 310.383 418.68 336.254 370.188 336.254 c -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 42.52 -38.976] cm -q -[1 0 0 1 -114.52 -16.583] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -894.617 200.516 m -894.617 200.516 l -894.617 285.699 825.555 354.762 740.371 354.762 c -655.188 354.762 586.129 285.699 586.129 200.516 c -586.129 115.332 655.188 46.2734 740.371 46.2734 c -825.555 46.2734 894.617 115.332 894.617 200.516 c -h -S -6.17008 w -/DeviceGray {} CS -[1] SC -913.125 200.516 m -913.125 200.516 l -913.125 295.922 835.777 373.27 740.371 373.27 c -644.965 373.27 567.617 295.922 567.617 200.516 c -567.617 105.109 644.965 27.7617 740.371 27.7617 c -835.777 27.7617 913.125 105.109 913.125 200.516 c -h -S -876.105 200.516 m -876.105 200.516 l -876.105 275.477 815.332 336.254 740.371 336.254 c -665.41 336.254 604.637 275.477 604.637 200.516 c -604.637 125.555 665.41 64.7813 740.371 64.7813 c -815.332 64.7813 876.105 125.555 876.105 200.516 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -q -[1 0 0 1 -72 -55.559] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceGray {} CS -[0] SC -688.859 293.063 m -702.395 316.508 709.523 343.113 709.523 370.188 c -709.523 397.262 702.395 423.863 688.859 447.309 c -S -6.17008 w -/DeviceGray {} CS -[1] SC -704.887 283.809 m -720.047 310.07 728.031 339.863 728.031 370.188 c -728.031 400.512 720.047 430.305 704.887 456.563 c -S -672.828 302.316 m -684.742 322.949 691.016 346.363 691.016 370.188 c -691.016 394.012 684.742 417.422 672.828 438.055 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[1 0 0 1 -157.039 -55.559] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceRGB {} CS -[0.8691 0 0.1399] SC -1079.71 370.188 m -1079.71 370.188 l -1079.71 455.371 1010.65 524.43 925.465 524.43 c -840.281 524.43 771.223 455.371 771.223 370.188 c -771.223 285.004 840.281 215.941 925.465 215.941 c -1010.65 215.941 1079.71 285.004 1079.71 370.188 c -h -S -6.17008 w -/DeviceGray {} CS -[1] SC -1098.22 370.188 m -1098.22 370.188 l -1098.22 465.594 1020.87 542.941 925.465 542.941 c -830.059 542.941 752.711 465.594 752.711 370.188 c -752.711 274.781 830.059 197.434 925.465 197.434 c -1020.87 197.434 1098.22 274.781 1098.22 370.188 c -h -S -1061.2 370.188 m -1061.2 370.188 l -1061.2 445.148 1000.43 505.922 925.465 505.922 c -850.504 505.922 789.73 445.148 789.73 370.188 c -789.73 295.227 850.504 234.453 925.465 234.453 c -1000.43 234.453 1061.2 295.227 1061.2 370.188 c -h -S -Q -Q -Q -[1 0 0 1 -85.039 0] cm -[1 0 0 1 42.52 -38.976] cm -q -[1 0 0 1 -114.52 -16.583] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -30.8488 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -873.953 277.641 m -846.402 325.363 795.477 354.762 740.371 354.762 c -S -6.17008 w -/DeviceGray {} CS -[1] SC -889.98 286.895 m -859.121 340.34 802.086 373.27 740.371 373.27 c -S -857.922 268.387 m -833.676 310.383 788.863 336.254 740.371 336.254 c -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -[1 0 0 1 42.52 -42.52] cm -[0.2 0 0 0.2 44.447 23.584] cm -[1 0 0 1 -85.039 0] cm -q -[5 0 0 5 -709.795 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -697.184 185.094 m -697.184 185.094 l -697.184 202.129 683.371 215.941 666.336 215.941 c -649.301 215.941 635.484 202.129 635.484 185.094 c -635.484 168.059 649.301 154.242 666.336 154.242 c -683.371 154.242 697.184 168.059 697.184 185.094 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -700.887 185.094 m -700.887 185.094 l -700.887 204.172 685.414 219.645 666.336 219.645 c -647.258 219.645 631.785 204.172 631.785 185.094 c -631.785 166.016 647.258 150.543 666.336 150.543 c -685.414 150.543 700.887 166.016 700.887 185.094 c -h -S -693.48 185.094 m -693.48 185.094 l -693.48 200.086 681.328 212.238 666.336 212.238 c -651.344 212.238 639.188 200.086 639.188 185.094 c -639.188 170.102 651.344 157.945 666.336 157.945 c -681.328 157.945 693.48 170.102 693.48 185.094 c -h -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -[1 0 0 1 -42.52 -38.976] cm -q -[5 0 0 5 -752.315 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -734.203 151.16 m -734.203 151.16 l -734.203 168.195 720.391 182.008 703.355 182.008 c -686.32 182.008 672.504 168.195 672.504 151.16 c -672.504 134.125 686.32 120.309 703.355 120.309 c -720.391 120.309 734.203 134.125 734.203 151.16 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -737.906 151.16 m -737.906 151.16 l -737.906 170.238 722.434 185.711 703.355 185.711 c -684.277 185.711 668.805 170.238 668.805 151.16 c -668.805 132.082 684.277 116.609 703.355 116.609 c -722.434 116.609 737.906 132.082 737.906 151.16 c -h -S -730.5 151.16 m -730.5 151.16 l -730.5 166.152 718.348 178.305 703.355 178.305 c -688.363 178.305 676.207 166.152 676.207 151.16 c -676.207 136.168 688.363 124.012 703.355 124.012 c -718.348 124.012 730.5 136.168 730.5 151.16 c -h -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 -85.039 0] cm -q -[5 0 0 5 -709.795 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -693.051 169.668 m -695.758 174.355 697.184 179.68 697.184 185.094 c -697.184 190.508 695.758 195.828 693.051 200.516 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -696.258 167.816 m -699.289 173.066 700.887 179.031 700.887 185.094 c -700.887 191.156 699.289 197.117 696.258 202.367 c -S -689.844 171.52 m -692.223 175.645 693.48 180.332 693.48 185.094 c -693.48 189.855 692.223 194.543 689.844 198.668 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[5 0 0 5 -794.834 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceGray {} CS -[0] SC -771.223 185.094 m -771.223 185.094 l -771.223 202.129 757.406 215.941 740.371 215.941 c -723.336 215.941 709.523 202.129 709.523 185.094 c -709.523 168.059 723.336 154.242 740.371 154.242 c -757.406 154.242 771.223 168.059 771.223 185.094 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -774.922 185.094 m -774.922 185.094 l -774.922 204.172 759.449 219.645 740.371 219.645 c -721.293 219.645 705.82 204.172 705.82 185.094 c -705.82 166.016 721.293 150.543 740.371 150.543 c -759.449 150.543 774.922 166.016 774.922 185.094 c -h -S -767.52 185.094 m -767.52 185.094 l -767.52 200.086 755.363 212.238 740.371 212.238 c -725.379 212.238 713.227 200.086 713.227 185.094 c -713.227 170.102 725.379 157.945 740.371 157.945 c -755.363 157.945 767.52 170.102 767.52 185.094 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 -38.976] cm -q -[5 0 0 5 -752.315 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -730.07 166.582 m -724.563 176.125 714.375 182.008 703.355 182.008 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -733.273 168.434 m -727.105 179.121 715.695 185.711 703.355 185.711 c -S -726.863 164.734 m -722.016 173.129 713.051 178.305 703.355 178.305 c -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 42.52 -38.976] cm -q -[5 0 0 5 -837.354 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -808.238 151.16 m -808.238 151.16 l -808.238 168.195 794.426 182.008 777.391 182.008 c -760.355 182.008 746.543 168.195 746.543 151.16 c -746.543 134.125 760.355 120.309 777.391 120.309 c -794.426 120.309 808.238 134.125 808.238 151.16 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -811.941 151.16 m -811.941 151.16 l -811.941 170.238 796.469 185.711 777.391 185.711 c -758.313 185.711 742.84 170.238 742.84 151.16 c -742.84 132.082 758.313 116.609 777.391 116.609 c -796.469 116.609 811.941 132.082 811.941 151.16 c -h -S -804.539 151.16 m -804.539 151.16 l -804.539 166.152 792.383 178.305 777.391 178.305 c -762.398 178.305 750.242 166.152 750.242 151.16 c -750.242 136.168 762.398 124.012 777.391 124.012 c -792.383 124.012 804.539 136.168 804.539 151.16 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -q -[5 0 0 5 -794.834 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceGray {} CS -[0] SC -767.09 169.668 m -769.797 174.355 771.223 179.68 771.223 185.094 c -771.223 190.508 769.797 195.828 767.09 200.516 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -770.293 167.816 m -773.324 173.066 774.922 179.031 774.922 185.094 c -774.922 191.156 773.324 197.117 770.293 202.367 c -S -763.883 171.52 m -766.262 175.645 767.52 180.332 767.52 185.094 c -767.52 189.855 766.262 194.543 763.883 198.668 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[5 0 0 5 -879.874 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.8691 0 0.1399] SC -845.258 185.094 m -845.258 185.094 l -845.258 202.129 831.445 215.941 814.41 215.941 c -797.375 215.941 783.563 202.129 783.563 185.094 c -783.563 168.059 797.375 154.242 814.41 154.242 c -831.445 154.242 845.258 168.059 845.258 185.094 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -848.961 185.094 m -848.961 185.094 l -848.961 204.172 833.488 219.645 814.41 219.645 c -795.332 219.645 779.859 204.172 779.859 185.094 c -779.859 166.016 795.332 150.543 814.41 150.543 c -833.488 150.543 848.961 166.016 848.961 185.094 c -h -S -841.555 185.094 m -841.555 185.094 l -841.555 200.086 829.402 212.238 814.41 212.238 c -799.418 212.238 787.262 200.086 787.262 185.094 c -787.262 170.102 799.418 157.945 814.41 157.945 c -829.402 157.945 841.555 170.102 841.555 185.094 c -h -S -Q -Q -Q -[1 0 0 1 -85.039 0] cm -[1 0 0 1 42.52 -38.976] cm -q -[5 0 0 5 -837.354 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -804.105 166.582 m -798.598 176.125 788.41 182.008 777.391 182.008 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -807.313 168.434 m -801.145 179.121 789.734 185.711 777.391 185.711 c -S -800.902 164.734 m -796.055 173.129 787.086 178.305 777.391 178.305 c -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -[5 0 0 5 -222.236 -117.921] cm -[1 0 0 1 -42.52 42.52] cm -[1 0 0 1 -42.52 -42.52] cm -[0.2 0 0 0.2 44.447 23.584] cm -[1 0 0 1 -85.039 0] cm -q -[5 0 0 5 -284.598 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -326.996 185.094 m -326.996 185.094 l -326.996 202.129 313.184 215.941 296.148 215.941 c -279.113 215.941 265.301 202.129 265.301 185.094 c -265.301 168.059 279.113 154.242 296.148 154.242 c -313.184 154.242 326.996 168.059 326.996 185.094 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -330.699 185.094 m -330.699 185.094 l -330.699 204.172 315.227 219.645 296.148 219.645 c -277.07 219.645 261.598 204.172 261.598 185.094 c -261.598 166.016 277.07 150.543 296.148 150.543 c -315.227 150.543 330.699 166.016 330.699 185.094 c -h -S -323.297 185.094 m -323.297 185.094 l -323.297 200.086 311.141 212.238 296.148 212.238 c -281.156 212.238 269 200.086 269 185.094 c -269 170.102 281.156 157.945 296.148 157.945 c -311.141 157.945 323.297 170.102 323.297 185.094 c -h -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -[1 0 0 1 -42.52 -38.976] cm -q -[5 0 0 5 -327.118 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -364.016 151.16 m -364.016 151.16 l -364.016 168.195 350.203 182.008 333.168 182.008 c -316.133 182.008 302.32 168.195 302.32 151.16 c -302.32 134.125 316.133 120.309 333.168 120.309 c -350.203 120.309 364.016 134.125 364.016 151.16 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -367.719 151.16 m -367.719 151.16 l -367.719 170.238 352.246 185.711 333.168 185.711 c -314.09 185.711 298.617 170.238 298.617 151.16 c -298.617 132.082 314.09 116.609 333.168 116.609 c -352.246 116.609 367.719 132.082 367.719 151.16 c -h -S -360.313 151.16 m -360.313 151.16 l -360.313 166.152 348.16 178.305 333.168 178.305 c -318.176 178.305 306.02 166.152 306.02 151.16 c -306.02 136.168 318.176 124.012 333.168 124.012 c -348.16 124.012 360.313 136.168 360.313 151.16 c -h -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 -85.039 0] cm -q -[5 0 0 5 -284.598 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -322.863 169.668 m -325.57 174.355 326.996 179.68 326.996 185.094 c -326.996 190.508 325.57 195.828 322.863 200.516 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -326.07 167.816 m -329.102 173.066 330.699 179.031 330.699 185.094 c -330.699 191.156 329.102 197.117 326.07 202.367 c -S -319.66 171.52 m -322.039 175.645 323.297 180.332 323.297 185.094 c -323.297 189.855 322.039 194.543 319.66 198.668 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[5 0 0 5 -369.637 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceGray {} CS -[0] SC -401.035 185.094 m -401.035 185.094 l -401.035 202.129 387.223 215.941 370.188 215.941 c -353.152 215.941 339.336 202.129 339.336 185.094 c -339.336 168.059 353.152 154.242 370.188 154.242 c -387.223 154.242 401.035 168.059 401.035 185.094 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -404.738 185.094 m -404.738 185.094 l -404.738 204.172 389.266 219.645 370.188 219.645 c -351.109 219.645 335.637 204.172 335.637 185.094 c -335.637 166.016 351.109 150.543 370.188 150.543 c -389.266 150.543 404.738 166.016 404.738 185.094 c -h -S -397.332 185.094 m -397.332 185.094 l -397.332 200.086 385.18 212.238 370.188 212.238 c -355.195 212.238 343.039 200.086 343.039 185.094 c -343.039 170.102 355.195 157.945 370.188 157.945 c -385.18 157.945 397.332 170.102 397.332 185.094 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 -38.976] cm -q -[5 0 0 5 -327.118 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -359.883 166.582 m -354.375 176.125 344.188 182.008 333.168 182.008 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -363.09 168.434 m -356.918 179.121 345.508 185.711 333.168 185.711 c -S -356.676 164.734 m -351.828 173.129 342.863 178.305 333.168 178.305 c -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 42.52 -38.976] cm -q -[5 0 0 5 -412.157 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -438.055 151.16 m -438.055 151.16 l -438.055 168.195 424.238 182.008 407.203 182.008 c -390.168 182.008 376.355 168.195 376.355 151.16 c -376.355 134.125 390.168 120.309 407.203 120.309 c -424.238 120.309 438.055 134.125 438.055 151.16 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -441.754 151.16 m -441.754 151.16 l -441.754 170.238 426.281 185.711 407.203 185.711 c -388.125 185.711 372.652 170.238 372.652 151.16 c -372.652 132.082 388.125 116.609 407.203 116.609 c -426.281 116.609 441.754 132.082 441.754 151.16 c -h -S -434.352 151.16 m -434.352 151.16 l -434.352 166.152 422.195 178.305 407.203 178.305 c -392.211 178.305 380.059 166.152 380.059 151.16 c -380.059 136.168 392.211 124.012 407.203 124.012 c -422.195 124.012 434.352 136.168 434.352 151.16 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -q -[5 0 0 5 -369.637 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceGray {} CS -[0] SC -396.902 169.668 m -399.609 174.355 401.035 179.68 401.035 185.094 c -401.035 190.508 399.609 195.828 396.902 200.516 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -400.109 167.816 m -403.141 173.066 404.738 179.031 404.738 185.094 c -404.738 191.156 403.141 197.117 400.109 202.367 c -S -393.695 171.52 m -396.074 175.645 397.332 180.332 397.332 185.094 c -397.332 189.855 396.074 194.543 393.695 198.668 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[5 0 0 5 -454.677 -183.118] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.8691 0 0.1399] SC -475.07 185.094 m -475.07 185.094 l -475.07 202.129 461.258 215.941 444.223 215.941 c -427.188 215.941 413.375 202.129 413.375 185.094 c -413.375 168.059 427.188 154.242 444.223 154.242 c -461.258 154.242 475.07 168.059 475.07 185.094 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -478.773 185.094 m -478.773 185.094 l -478.773 204.172 463.301 219.645 444.223 219.645 c -425.145 219.645 409.672 204.172 409.672 185.094 c -409.672 166.016 425.145 150.543 444.223 150.543 c -463.301 150.543 478.773 166.016 478.773 185.094 c -h -S -471.371 185.094 m -471.371 185.094 l -471.371 200.086 459.215 212.238 444.223 212.238 c -429.23 212.238 417.074 200.086 417.074 185.094 c -417.074 170.102 429.23 157.945 444.223 157.945 c -459.215 157.945 471.371 170.102 471.371 185.094 c -h -S -Q -Q -Q -[1 0 0 1 -85.039 0] cm -[1 0 0 1 42.52 -38.976] cm -q -[5 0 0 5 -412.157 -144.141] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -433.922 166.582 m -428.414 176.125 418.223 182.008 407.203 182.008 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -437.125 168.434 m -430.957 179.121 419.547 185.711 407.203 185.711 c -S -430.715 164.734 m -425.867 173.129 416.902 178.305 407.203 178.305 c -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -[5 0 0 5 -222.236 -117.921] cm -[1 0 0 1 42.52 42.52] cm -[1 0 0 1 0 14.173] cm -[0.2 0 0 0.2 44.447 23.584] cm -[1 0 0 1 -85.039 0] cm -q -[5 0 0 5 -497.197 -466.582] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -512.09 431.883 m -512.09 431.883 l -512.09 448.918 498.277 462.734 481.242 462.734 c -464.207 462.734 450.395 448.918 450.395 431.883 c -450.395 414.848 464.207 401.035 481.242 401.035 c -498.277 401.035 512.09 414.848 512.09 431.883 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -515.793 431.883 m -515.793 431.883 l -515.793 450.961 500.32 466.434 481.242 466.434 c -462.164 466.434 446.691 450.961 446.691 431.883 c -446.691 412.805 462.164 397.332 481.242 397.332 c -500.32 397.332 515.793 412.805 515.793 431.883 c -h -S -508.391 431.883 m -508.391 431.883 l -508.391 446.875 496.234 459.031 481.242 459.031 c -466.25 459.031 454.094 446.875 454.094 431.883 c -454.094 416.891 466.25 404.738 481.242 404.738 c -496.234 404.738 508.391 416.891 508.391 431.883 c -h -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -[1 0 0 1 -42.52 -38.976] cm -q -[5 0 0 5 -539.716 -427.606] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -549.109 397.949 m -549.109 397.949 l -549.109 414.984 535.297 428.797 518.262 428.797 c -501.227 428.797 487.41 414.984 487.41 397.949 c -487.41 380.914 501.227 367.102 518.262 367.102 c -535.297 367.102 549.109 380.914 549.109 397.949 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -552.813 397.949 m -552.813 397.949 l -552.813 417.027 537.34 432.5 518.262 432.5 c -499.184 432.5 483.711 417.027 483.711 397.949 c -483.711 378.871 499.184 363.398 518.262 363.398 c -537.34 363.398 552.813 378.871 552.813 397.949 c -h -S -545.406 397.949 m -545.406 397.949 l -545.406 412.941 533.254 425.098 518.262 425.098 c -503.27 425.098 491.113 412.941 491.113 397.949 c -491.113 382.957 503.27 370.805 518.262 370.805 c -533.254 370.805 545.406 382.957 545.406 397.949 c -h -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 -85.039 0] cm -q -[5 0 0 5 -497.197 -466.582] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.5195 0.7793] SC -507.957 416.461 m -510.664 421.148 512.09 426.469 512.09 431.883 c -512.09 437.297 510.664 442.621 507.957 447.309 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -511.164 414.609 m -514.195 419.859 515.793 425.82 515.793 431.883 c -515.793 437.945 514.195 443.91 511.164 449.16 c -S -504.754 418.309 m -507.133 422.434 508.391 427.121 508.391 431.883 c -508.391 436.645 507.133 441.332 504.754 445.457 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[5 0 0 5 -582.236 -466.582] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceGray {} CS -[0] SC -586.129 431.883 m -586.129 431.883 l -586.129 448.918 572.313 462.734 555.277 462.734 c -538.242 462.734 524.43 448.918 524.43 431.883 c -524.43 414.848 538.242 401.035 555.277 401.035 c -572.313 401.035 586.129 414.848 586.129 431.883 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -589.828 431.883 m -589.828 431.883 l -589.828 450.961 574.355 466.434 555.277 466.434 c -536.199 466.434 520.727 450.961 520.727 431.883 c -520.727 412.805 536.199 397.332 555.277 397.332 c -574.355 397.332 589.828 412.805 589.828 431.883 c -h -S -582.426 431.883 m -582.426 431.883 l -582.426 446.875 570.27 459.031 555.277 459.031 c -540.285 459.031 528.133 446.875 528.133 431.883 c -528.133 416.891 540.285 404.738 555.277 404.738 c -570.27 404.738 582.426 416.891 582.426 431.883 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 -38.976] cm -q -[5 0 0 5 -539.716 -427.606] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.9609 0.7793 0] SC -544.977 413.375 m -539.469 422.918 529.281 428.797 518.262 428.797 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -548.184 415.227 m -542.012 425.914 530.602 432.5 518.262 432.5 c -S -541.77 411.523 m -536.922 419.922 527.957 425.098 518.262 425.098 c -S -Q -Q -Q -[1 0 0 1 42.52 38.976] cm -[1 0 0 1 42.52 -38.976] cm -q -[5 0 0 5 -624.756 -427.606] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -623.148 397.949 m -623.148 397.949 l -623.148 414.984 609.332 428.797 592.297 428.797 c -575.262 428.797 561.449 414.984 561.449 397.949 c -561.449 380.914 575.262 367.102 592.297 367.102 c -609.332 367.102 623.148 380.914 623.148 397.949 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -626.848 397.949 m -626.848 397.949 l -626.848 417.027 611.375 432.5 592.297 432.5 c -573.219 432.5 557.746 417.027 557.746 397.949 c -557.746 378.871 573.219 363.398 592.297 363.398 c -611.375 363.398 626.848 378.871 626.848 397.949 c -h -S -619.445 397.949 m -619.445 397.949 l -619.445 412.941 607.289 425.098 592.297 425.098 c -577.305 425.098 565.152 412.941 565.152 397.949 c -565.152 382.957 577.305 370.805 592.297 370.805 c -607.289 370.805 619.445 382.957 619.445 397.949 c -h -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -q -[5 0 0 5 -582.236 -466.582] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceGray {} CS -[0] SC -581.996 416.461 m -584.703 421.148 586.129 426.469 586.129 431.883 c -586.129 437.297 584.703 442.621 581.996 447.309 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -585.199 414.609 m -588.23 419.859 589.828 425.82 589.828 431.883 c -589.828 437.945 588.23 443.91 585.199 449.16 c -S -578.789 418.309 m -581.168 422.434 582.426 427.121 582.426 431.883 c -582.426 436.645 581.168 441.332 578.789 445.457 c -S -Q -Q -Q -[1 0 0 1 85.039 0] cm -q -[5 0 0 5 -667.275 -466.582] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0.8691 0 0.1399] SC -660.164 431.883 m -660.164 431.883 l -660.164 448.918 646.352 462.734 629.316 462.734 c -612.281 462.734 598.469 448.918 598.469 431.883 c -598.469 414.848 612.281 401.035 629.316 401.035 c -646.352 401.035 660.164 414.848 660.164 431.883 c -h -S -1.23402 w -/DeviceGray {} CS -[1] SC -663.867 431.883 m -663.867 431.883 l -663.867 450.961 648.395 466.434 629.316 466.434 c -610.238 466.434 594.766 450.961 594.766 431.883 c -594.766 412.805 610.238 397.332 629.316 397.332 c -648.395 397.332 663.867 412.805 663.867 431.883 c -h -S -656.465 431.883 m -656.465 431.883 l -656.465 446.875 644.309 459.031 629.316 459.031 c -614.324 459.031 602.168 446.875 602.168 431.883 c -602.168 416.891 614.324 404.738 629.316 404.738 c -644.309 404.738 656.465 416.891 656.465 431.883 c -h -S -Q -Q -Q -[1 0 0 1 -85.039 0] cm -[1 0 0 1 42.52 -38.976] cm -q -[5 0 0 5 -624.756 -427.606] cm -q -[1 0 0 1 0 0] cm -0 0 2384 3370 re -W -q -[0.229721 0 0 0.229721 0 0] cm -6.16975 w -/DeviceRGB {} CS -[0 0.6191 0.24] SC -619.012 413.375 m -613.504 422.918 603.316 428.797 592.297 428.797 c -S -1.23402 w -/DeviceGray {} CS -[1] SC -622.219 415.227 m -616.051 425.914 604.641 432.5 592.297 432.5 c -S -615.809 411.523 m -610.961 419.922 601.996 425.098 592.297 425.098 c -S -Q -Q -Q -[1 0 0 1 -42.52 38.976] cm -[5 0 0 5 -222.236 -117.921] cm -[1 0 0 1 0 -14.173] cm -Q -Q -Q -Q -showpage -%%PageTrailer -pdfEndPage -%%Trailer -end -%%DocumentSuppliedResources: -%%EOF diff --git a/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.pdf b/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.pdf Binary files differdeleted file mode 100644 index 9862b9798c..0000000000 --- a/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.pdf +++ /dev/null diff --git a/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.tex b/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.tex deleted file mode 100644 index 3a24a7ca00..0000000000 --- a/graphics/pstricks/contrib/pstricks-add/doc/data/olympic.tex +++ /dev/null @@ -1,10 +0,0 @@ -\documentclass[pstricks]{standalone} -\usepackage{pstricks-add} -\begin{document} -\begin{pspicture}(-4.5,-3)(4.5,1.5) -\psOlympicRings(0,0) -\psOlympicRings[psscale=0.2](1.5,-1.5) -\psOlympicRings[psscale=0.2](-1.5,-1.5) -\psOlympicRings[psscale=0.2](0,0.5) -\end{pspicture} -\end{document} diff --git a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf Binary files differindex bcf5584512..5a78533121 100644 --- a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf +++ b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf diff --git a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex index 48cfcfc14e..3ce19617c0 100644 --- a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex +++ b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex @@ -1,4 +1,6 @@ %% $Id: pstricks-add-doc.tex 1142 2020-02-12 19:07:50Z herbert $ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{} % \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,oneside]{pst-doc} @@ -12,15 +14,13 @@ %} \makeatother -\usepackage{siunitx} +\usepackage{siunitx,iftex} \sisetup{add-decimal-zero, round-mode=places, round-precision=2, output-decimal-marker={,}, detect-all} - - %\input{data/pstricks-add-doc.data} %\usepackage{pstricks-add} @@ -40,7 +40,14 @@ \lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}}, escapechar=§} -\def\bgImage{\includegraphics{data/olympic}} +\def\bgImage{%\includegraphics{data/olympic} + \begin{pspicture}(-4.5,-3)(4.5,1.5) + \psOlympicRings[bgcolor=lightgray](0,0) + \psOlympicRings[bgcolor=lightgray,psscale=0.2](1.5,-1.5) + \psOlympicRings[bgcolor=lightgray,psscale=0.2](-1.5,-1.5) + \psOlympicRings[bgcolor=lightgray,psscale=0.2](0,0.5) + \end{pspicture}% +} \iffalse \psset{unit=1.5} @@ -68,7 +75,7 @@ \author{Dominique Rodriguez\\Michael Sharpe\\Herbert Voß} \date{\today} -\maketitle +\settitle \fullWidth=\linewidth \advance\fullWidth by \marginparsep @@ -110,10 +117,11 @@ Christophe Fourey; Hubert G\"a\ss lein; J\"urgen Gilg; Denis Girou; -Pablo Gonzáles; +Pablo Gonzáles Luengo; Peter Hutnick; Christophe Jorssen; Uwe Kern; +Marcel Krüger; Friedrich Lenk; Manuel Luque; Jens-Uwe Morawski; @@ -2223,7 +2231,7 @@ whose derivative is : The parameter must be the letter $t$ instead of $x$ and when using the \Lkeyword{algebraic} option you must separate the two equations by -a \Lnotation{|} (see example). +a \nxLnotation{|} (see example). \begin{LTXexample}[pos=t,wide] \def\Lissa{t dup 2 RadtoDeg mul cos 3.5 mul exch 6 mul RadtoDeg sin 3.5 mul}% @@ -2298,9 +2306,9 @@ the cosine. OrangeRed\or CarnationPink\or RoyalPurple\or Lavender\fi} \begin{pspicture}[showgrid=true](0,-1.2)(7,1.5) \psclip{\psframe[linestyle=none](0,-1.1)(7,1.1)} - \multido{\in=0+1}{16}{% - \psplot[linewidth=1pt,algebraic,linecolor=\getColor{\in}]{0}{7} - {Derive(\in,1-x^2/2+x^4/24-x^6/720+x^8/40320-x^10/3628800+x^12/479001600-x^14/87178291200)}} + \multido{\i=0+1}{16}{% + \psplot[linewidth=1pt,algebraic,linecolor=\getColor{\i}]{0}{7} + {Derive(\i,1-x^2/2+x^4/24-x^6/720+x^8/40320-x^10/3628800+x^12/479001600-x^14/87178291200)}} \endpsclip \end{pspicture} \end{LTXexample} @@ -3969,29 +3977,31 @@ with the color, from violet to red. \Lkeyword{colorType}=3 is the grayscale image and \Lkeyword{colorType}=4 the same invers. The following examples use a 200$\times$200 -matrix data, which is saved as /dotmatrix [...] in the file \LFile{pstricks-add-doc.dat}. +matrix data, which is saved as /dotmatrix [...] in the file \LFile{pstricks-add-doc.dat}. To speed up such images it should +be printed with the optional argument \Lkeyword{PixelPlot}. Then each point is printed by a simple dot without using the PSTricks font dot. +The dot can be scaled by \Lkeyword{dotsize}, e.g. \verb|dotsize=5pt|. \begin{LTXexample}[pos=t,preset=\centering] \begin{pspicture}(10,10) - \psMatrixPlot[colorType=1,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} + \psMatrixPlot[PixelPlot,colorType=1,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} \end{pspicture} \end{LTXexample} \begin{LTXexample}[pos=t,preset=\centering] \begin{pspicture}(10,10) - \psMatrixPlot[colorType=2,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} + \psMatrixPlot[PixelPlot,colorType=2,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} \end{pspicture} \end{LTXexample} \begin{LTXexample}[pos=t,preset=\centering] \begin{pspicture}(10,10) - \psMatrixPlot[colorType=3,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} + \psMatrixPlot[PixelPlot,colorType=3,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} \end{pspicture} \end{LTXexample} \begin{LTXexample}[pos=t,preset=\centering] \begin{pspicture}(10,10) - \psMatrixPlot[colorType=4,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} + \psMatrixPlot[PixelPlot,colorType=4,xStep=0.05,yStep=0.05]{200}{200}{data/dotmatrix.data} \end{pspicture} \end{LTXexample} \egroup @@ -4215,7 +4225,7 @@ a vector normal to \texttt{PtDelta.X, PtDelta.Y} in the visual, not mathematical always constructed so as to point ``upward'' (ie, to your left) as you traverse the curve in the positive direction. The PostScript variable \texttt{unitratio} provides the ratio of the unit on the y axis to that on x axis, and \texttt{unitratiosq} is its square. All of -these PostScript objects are stored in the main \texttt{pstricks} dictionary \Lps{tx@Dict} +these PostScript objects are stored in the main \texttt{pstricks} dictionary \nxLps{tx@Dict} which should be automatically made available when using many \texttt{pstricks} macros. If \texttt{gs} returns you an error message like \begin{verbatim} @@ -4734,6 +4744,7 @@ Spectrum of hydrogen emission (Manuel Luque) + %-------------------------------------------------------------------------------------- \section{Gouraud shading} %-------------------------------------------------------------------------------------- @@ -4786,9 +4797,6 @@ be seen with Acroread 7 or later. The syntax is easy: \end{LTXexample} - - - \section{\Lcs{psCallout}} \begin{BDef} diff --git a/graphics/pstricks/contrib/pstricks-add/dvips/pstricks-add.pro b/graphics/pstricks/contrib/pstricks-add/dvips/pstricks-add.pro index e30317ca78..3a80895f50 100644 --- a/graphics/pstricks/contrib/pstricks-add/dvips/pstricks-add.pro +++ b/graphics/pstricks/contrib/pstricks-add/dvips/pstricks-add.pro @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.pro 37 2014-07-22 13:52:12Z herbert $ +%% $Id: pstricks-add.pro 216 2021-09-10 12:28:13Z herbert $ %% % PostScript prologue for pstricks-add.tex. % @@ -80,6 +80,7 @@ realtime srand % set random generator %% www.efg2.com/lab % /Gamma 0.8 def + /calculateRGB { lambda 379 le {/Red 0 def /Green 0 def /Blue 0 def} if lambda 781 ge {/Red 0 def /Green 0 def /Blue 0 def} if diff --git a/graphics/pstricks/contrib/pstricks-add/latex/pstricks-add.sty b/graphics/pstricks/contrib/pstricks-add/latex/pstricks-add.sty index 4e021d197e..c46cff380a 100644 --- a/graphics/pstricks/contrib/pstricks-add/latex/pstricks-add.sty +++ b/graphics/pstricks/contrib/pstricks-add/latex/pstricks-add.sty @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.sty 726 2018-02-05 13:52:25Z herbert $ +%% $Id: pstricks-add.sty 220 2021-09-10 15:30:30Z herbert $ % \RequirePackage{pstricks} \RequirePackage{pst-plot} @@ -7,7 +7,7 @@ \RequirePackage{pst-math} \RequirePackage{multido} -\ProvidesPackage{pstricks-add}[2018/02/04 v. 0.16 package wrapper for +\ProvidesPackage{pstricks-add}[2021/09/10 v. 0.17 package wrapper for pstricks-add.tex (hv)] \input{pstricks-add.tex} \ProvidesFile{pstricks-add.tex} @@ -19,27 +19,4 @@ \RequirePackage{pst-calculate} -\def\psRiemannSum(#1,#2)#3#4{% (x0,x1) n f(#1) - \def\psFunction@##1{#4}% - \edef\ps@@dx{\pscalculate{(#2-#1)/#3}}% - \edef\ps@@dxHalf{\pscalculate{\ps@@dx/2}}% -% \typeout{dx=\ps@dx}% - \def\psRightSumValue{0}% - \def\psLeftSumValue{0}% - \def\psMiddleSumValue{0}% - \def\psDiffSumValue{0}% - \Multido{\rA=#1+\ps@@dx,\rB=\ps@@dx+\ps@@dx,\rC=\ps@@dxHalf+\ps@@dx}{#3}{% - \def\ps@rightY{\pscalculate{\psFunction@{\rB}}}% - \def\ps@leftY{\pscalculate{\psFunction@{\rA}}}% - \def\ps@middleY{\pscalculate{\psFunction@{\rC}}}% -% \typeout{\ps@leftY, \ps@rightY }% - \edef\psLeftSumValue{\pscalculate{\psLeftSumValue+\ps@@dx*\ps@leftY}}% - \edef\psRightSumValue{\pscalculate{\psRightSumValue+\ps@@dx*\ps@rightY}}% - \edef\psMiddleSumValue{\pscalculate{\psMiddleSumValue+\ps@@dx*\ps@middleY}}% - \edef\psDiffSumValue{\pscalculate{\psDiffSumValue+abs(\ps@@dx*(\ps@rightY-\ps@leftY))}}% -% \typeout{\psLeftSumValue , \psRightSumValue }% - }% end \Multido -} - - \endinput diff --git a/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex b/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex index ea91e51a47..2fa480ae81 100644 --- a/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex +++ b/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex @@ -31,8 +31,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.89a} -\def\filedate{2020/02/12} +\def\fileversion{3.90} +\def\filedate{2021/09/10} \let\pstricksaddFV\fileversion \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % @@ -750,6 +750,28 @@ a add } ifelse ){#5}% } % +\def\psRiemannSum(#1,#2)#3#4{% (x0,x1) n f(#1) + \def\psFunction@##1{#4}% + \edef\ps@@dx{\pscalculate{(#2-#1)/#3}}% + \edef\ps@@dxHalf{\pscalculate{\ps@@dx/2}}% +% \typeout{dx=\ps@dx}% + \def\psRightSumValue{0}% + \def\psLeftSumValue{0}% + \def\psMiddleSumValue{0}% + \def\psDiffSumValue{0}% + \Multido{\rA=#1+\ps@@dx,\rB=\ps@@dx+\ps@@dx,\rC=\ps@@dxHalf+\ps@@dx}{#3}{% + \def\ps@rightY{\pscalculate{\psFunction@{\rB}}}% + \def\ps@leftY{\pscalculate{\psFunction@{\rA}}}% + \def\ps@middleY{\pscalculate{\psFunction@{\rC}}}% +% \typeout{\ps@leftY, \ps@rightY }% + \edef\psLeftSumValue{\pscalculate{\psLeftSumValue+\ps@@dx*\ps@leftY}}% + \edef\psRightSumValue{\pscalculate{\psRightSumValue+\ps@@dx*\ps@rightY}}% + \edef\psMiddleSumValue{\pscalculate{\psMiddleSumValue+\ps@@dx*\ps@middleY}}% + \edef\psDiffSumValue{\pscalculate{\psDiffSumValue+abs(\ps@@dx*(\ps@rightY-\ps@leftY))}}% +% \typeout{\psLeftSumValue , \psRightSumValue }% + }% end \Multido +} + %\define@key[psset]{pstricks-add}{method}{\def\psk@method{#1}}% defined in pst-plot \define@key[psset]{pstricks-add}{whichabs}{\def\psk@whichabs{#1}}% \define@key[psset]{pstricks-add}{whichord}{\def\psk@whichord{#1}}% @@ -1361,7 +1383,6 @@ a add % \def\psGTriangle{\def\pst@par{}\pst@object{psGTriangle}} \def\psGTriangle@i(#1)(#2)(#3)#4#5#6{{% - \def\solid@star{}% \begin@ClosedObj \pst@getcoor{#1}\pst@tempA % A: "rgb xr xg xb" or "gray xg" \pst@getcoor{#2}\pst@tempB % B @@ -1374,11 +1395,14 @@ a add \pst@tempB % B \psk@gangle % rotating angle \pst@tempA % A, temporary origin - /rgb {} def - /gray {} def - [ \pst@colorC ] aload length 1 eq { dup dup } if 3 array astore % gray -> rgb - [ \pst@colorB ] aload length 1 eq { dup dup } if 3 array astore - [ \pst@colorA ] aload length 1 eq { dup dup } if 3 array astore +% /rgb {} def +% /gray {} def +% /rg /setrgbcolor load def +% /RG /setrgbcolor load def +% we use RGB + [ \psgetRGBColorValues{\pst@colorC} ] aload length 1 eq { dup dup } if 3 array astore % gray -> rgb + [ \psgetRGBColorValues{\pst@colorB} ] aload length 1 eq { dup dup } if 3 array astore + [ \psgetRGBColorValues{\pst@colorA} ] aload length 1 eq { dup dup } if 3 array astore tx@addDict begin GTriangle end % PS part }% \if@star\pspolygon[fillstyle=none](#1)(#2)(#3)\fi% draw borderline @@ -1417,28 +1441,32 @@ a add \define@key[psset]{pstricks-add}{Yoffset}[0pt]{\pst@getlength{#1}\psk@Yoffset} \define@key[psset]{pstricks-add}{XYoffset}[0pt]{\pst@getlength{#1}\psk@Xoffset\let\psk@Yoffset\psk@Xoffset} \psset[pstricks-add]{XYoffset=0pt} +\define@boolkey[psset]{pstricks-add}[Pst@]{PixelPlot}[true]{} % \ifPst@saveData \define@key[psset]{pstricks-add}{colorType}[0]{\def\psk@colorType{#1}} \define@key[psset]{pstricks-add}{colorTypeDef}[{}]{\def\psk@colorTypeDef{#1\space}} -\psset[pstricks-add]{colorType=0,colorTypeDef={}} % 0-> two color mode 1->wavelength mode (400..700nm) +\psset[pstricks-add]{PixelPlot=false,colorType=0,colorTypeDef={}} % 0-> two color mode 1->wavelength mode (400..700nm) % 0-> two color mode % 1-> wavelength mode (400..700nm) % 2-> wavelength mode inverse % 3-> gray color mode % 4-> gray color mode invers % 5-> own color definition +% + \def\psMatrixPlot{\def\pst@par{}\pst@object{psMatrixPlot}} \def\psMatrixPlot@i#1#2#3{% \pst@killglue% \addbefore@par{xStep=1,yStep=1}% \begin@SpecialObj% \addto@pscode{ + 20 dict begin (#3) run % load the data file /Min 0 def /Max 0 def dotmatrix { dup Min lt { /Min ED } { dup Max gt { /Max ED } { pop } ifelse } ifelse } forall /dMaxMin Max Min sub def - \psk@dotsize + \psk@dotsize % defines /DS ... def \psk@Xoffset\space \psk@Yoffset\space translate - \@nameuse{psds@\psk@dotstyle} % + \ifPst@PixelPlot\else\@nameuse{psds@\psk@dotstyle}\fi /n 0 def % index for element 1 1 #1 { % the y loop (outer one) /y exch def % save y @@ -1463,13 +1491,15 @@ a add currentdict /colorTypeDef known { colorTypeDef } { \psk@colorTypeDef } ifelse \fi x \psk@xStep\space mul \pst@number\psxunit mul - \ifPst@ChangeOrder #1 y sub 1 add \else y \fi \psk@yStep\space mul \pst@number\psyunit mul Dot% + \ifPst@ChangeOrder #1 y sub 1 add \else y \fi \psk@yStep\space mul \pst@number\psyunit mul + \ifPst@PixelPlot 1 DS mul 0 360 arc fill \else Dot \fi \ifcase\psk@colorType } { pop } ifelse \fi /n n 1 add def } for } for + end }% \end@SpecialObj% \ignorespaces% @@ -2185,34 +2215,32 @@ a add \def\ps@lympicRing(#1)#2{% \rput(#1){% \pscircle[linewidth=0.25,linecolor=#2](0,0){1.375}% - \pscircle[linewidth=0.05,linecolor=white](0,0){1.425}% - \pscircle[linewidth=0.05,linecolor=white](0,0){1.125}}} + \pscircle[linewidth=0.05,linecolor=\pst@bgcolor](0,0){1.525}% + \pscircle[linewidth=0.05,linecolor=\pst@bgcolor](0,0){1.225}}} \def\ps@lympicArc(#1)#2#3#4{% \rput(#1){% - \psarc[linewidth=0.25,linecolor=#2](0,0){1.25}{#3}{#4}% - \psarc[linewidth=0.05,linecolor=white](0,0){1.4}{#3}{#4}% - \psarc[linewidth=0.05,linecolor=white](0,0){1.1}{#3}{#4}}} + \psarc[linewidth=0.25,linecolor=#2](0,0){1.375}{#3}{#4}% + \psarc[linewidth=0.05,linecolor=\pst@bgcolor](0,0){1.525}{#3}{#4}% + \psarc[linewidth=0.05,linecolor=\pst@bgcolor](0,0){1.225}{#3}{#4}}} \def\psOlympicRings{\pst@object{psOlympicRings}} \def\psOlympicRings@i(#1){% \pst@killglue \begingroup - \addbefore@par{psscale=1}% -% \begin@SpecialObj + \addbefore@par{bgcolor=white,dimen=inner,psscale=1}% \use@par \rput(#1){% \psscalebox{\psk@@psscale}{% - %\begin{pspicture}(-4.5,-3)(4.5,1.5) - \ps@lympicRing(-3,0){OlympicBlue}% - \ps@lympicRing(-1.5,-1.375){OlympicYellow}% - \ps@lympicArc(-3,0){OlympicBlue}{330}{30}% + \ps@lympicRing(-3.2,0){OlympicBlue}% + \ps@lympicRing(-1.6,-1.375){OlympicYellow}% + \ps@lympicArc(-3.2,0){OlympicBlue}{330}{30}% \ps@lympicRing(0,0){black}% - \ps@lympicArc(-1.5,-1.375){OlympicYellow}{30}{90}% - \ps@lympicRing(1.5,-1.375){OlympicGreen}% + \ps@lympicArc(-1.6,-1.375){OlympicYellow}{30}{90}% + \ps@lympicRing(1.6,-1.375){OlympicGreen}% \ps@lympicArc(0,0){black}{330}{30}% - \ps@lympicRing(3,0){OlympicRed}% - \ps@lympicArc(1.5,-1.375){OlympicGreen}{30}{90}}}% - %\end{pspicture} -% \end@SpecialObj + \ps@lympicRing(3.2,0){OlympicRed}% + \ps@lympicArc(1.6,-1.375){OlympicGreen}{30}{90} + }% + }% \endgroup } |