From 4b2f94e6f9f4425195657c2efbff5667c0399b5d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Aug 2016 21:09:43 +0000 Subject: pstricks-add (8aug16) git-svn-id: svn://tug.org/texlive/trunk@41822 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pstricks-add/Changes | 3 +- Master/texmf-dist/doc/generic/pstricks-add/README | 2 +- .../doc/generic/pstricks-add/data/olympic.eps | 1811 ++++++++++++++++++++ .../doc/generic/pstricks-add/data/olympic.pdf | Bin 0 -> 18163 bytes .../doc/generic/pstricks-add/data/olympic.tex | 10 + .../doc/generic/pstricks-add/pstricks-add-doc.bib | 6 +- .../doc/generic/pstricks-add/pstricks-add-doc.pdf | Bin 5173285 -> 5188674 bytes .../doc/generic/pstricks-add/pstricks-add-doc.tex | 38 +- .../tex/generic/pstricks-add/pstricks-add.tex | 48 +- 9 files changed, 1908 insertions(+), 10 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps create mode 100644 Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf create mode 100644 Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index c60ad980529..5c6f1456264 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/Changes +++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes @@ -1,4 +1,4 @@ -%% $Id: Changes 287 2016-04-25 07:43:53Z herbert $ +%% $Id: Changes 315 2016-08-08 15:20:00Z herbert $ %% pstricks-add.pro ----------- 0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY @@ -39,6 +39,7 @@ pstricks-add.sty ----------- (hv) pstricks-add.tex ----------- (hv) + v 3.81 2016-08-08 - added \psOlympicRings v 3.80 2016-04-25 - moved node definitions into pst-node v 3.79 2016-02-09 - added optional argument randInit to intialize the random generator diff --git a/Master/texmf-dist/doc/generic/pstricks-add/README b/Master/texmf-dist/doc/generic/pstricks-add/README index f03cf6cd819..09908fde1ac 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/README +++ b/Master/texmf-dist/doc/generic/pstricks-add/README @@ -35,7 +35,7 @@ Save the files pstricks-add.sty|pro|tex in a directory, which is part of your local TeX tree. The pro file should go into $TEXMF/dvips/pstricks/ Then do not forget to run texhash to update this tree. -For more information see the documentation of your LATEX distribution +For more information see the documentation of your LaTeX distribution on installing packages into your local TeX system or read the TeX Frequently Asked Questions: (http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). diff --git a/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps b/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps new file mode 100644 index 00000000000..6dc4b2a8045 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps @@ -0,0 +1,1811 @@ +%!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/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf b/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf new file mode 100644 index 00000000000..9862b9798cb Binary files /dev/null and b/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex b/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex new file mode 100644 index 00000000000..3a24a7ca00c --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex @@ -0,0 +1,10 @@ +\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/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib index e4118ec8900..0ab5d3105f5 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib @@ -17,9 +17,9 @@ @Book{PSTricks2, author = {Herbert Vo\ss}, title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {6.}, + edition = {7}, publisher = {DANTE -- Lehmanns}, - year = {2010}, + year = {2016}, address = {Heidelberg/Berlin} } @@ -104,7 +104,7 @@ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, title = {The {\LaTeX} {G}raphics {C}ompanion}, publisher = {{Addison-Wesley Publishing Company}}, - edition = second, + edition = 2, year = {2007}, address = {Reading, Mass.} } diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf index 5112ab91c44..80ab440ddcb 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf and b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex index 0f58964ab66..7626dcc22a1 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add-doc.tex 287 2016-04-25 07:43:53Z herbert $ +%% $Id: pstricks-add-doc.tex 318 2016-08-08 16:54:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings, headexclude,footexclude,oneside]{pst-doc} \listfiles @@ -30,7 +30,10 @@ \lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}}, escapechar=ยง} -\def\bgImage{\psset{unit=1.5} +\def\bgImage{\includegraphics{data/olympic}} + +\iffalse +\psset{unit=1.5} \begin{pspicture}(-3,-3)(3,3) \psChart[userColor={red!30,green!30,blue!40,gray,cyan!50, magenta!60,cyan},chartSep=30pt,shadow=true,shadowsize=5pt]{34.5,17.2,20.7,15.5,5.2,6.9}{6}{2} @@ -45,6 +48,8 @@ \rput(psChartI1){Taxes}\rput(psChartI2){Rent}\rput(psChartI3){Bills} \rput(psChartI4){Car}\rput(psChartI5){Gas}\rput(psChartI6){Food} \end{pspicture}} +\fi + \begin{document} \title{\texttt{pstricks-add}\\additionals Macros for \texttt{pstricks}\\ @@ -135,6 +140,8 @@ Timothy Van Zandt %\psGetDistance(-2111,-12)(3,1)\DVal ==> Overflow! \end{LTXexample} + + \clearpage %-------------------------------------------------------------------------------------- @@ -1121,6 +1128,33 @@ the dice $1\mathrm{cm}\times1\mathrm{cm}$. \end{pspicture} \end{lstlisting} + +\clearpage +\section{Olympic Rings} +The colors for the Rings are defined as \LColor{OlympicBlue}, \LColor{OlympicRed}, \LColor{OlympicGreen}, +and \LColor{OlympicYellow} and can be overwritten by the user. The only valid optional argument +is \Lkeyword{psscale} for scaling. + +\begin{BDef} +\Lcs{psOlympicRings}\OptArgs\coord1 +\end{BDef} + +\resetOptions +\psset{unit=1cm,doubleline=false,linearc=0,psscale=1} + +\includegraphics{data/olympic} + +\begin{lstlisting} +\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{lstlisting} + + + \clearpage %-------------------------------------------------------------------------------------- \section{\nxLcs{psFormatInt}} diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index 16c810160f7..74b10ece20b 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.tex 287 2016-04-25 07:43:53Z herbert $ +%% $Id: pstricks-add.tex 317 2016-08-08 16:49:34Z herbert $ %% %% This is file `pstricks-add.tex', %% @@ -30,8 +30,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.80} -\def\filedate{2016/04/25} +\def\fileversion{3.81} +\def\filedate{2016/08/08} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -2540,6 +2540,48 @@ a add }% \end@SpecialObj% } +\newrgbcolor{OlympicRed}{0.87 0 0.14} +\newrgbcolor{OlympicGreen}{0 0.62 0.24} +\newrgbcolor{OlympicBlue}{0 0.52 0.78} +\newrgbcolor{OlympicYellow}{0.96 0.78 0} +%\definecolor{oblue}{rgb}{0,.52,.78} +%\definecolor{oyellow}{rgb}{.96,.76,0} +%\definecolor{ogreen}{rgb}{0,.62,.24} +%\definecolor{ored}{rgb}{.87,0,.14} + +\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}}} +\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}}} +\def\psOlympicRings{\pst@object{psOlympicRings}} +\def\psOlympicRings@i(#1){% + \pst@killglue + \begingroup + \addbefore@par{psscale=1}% +% \begin@SpecialObj + \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(0,0){black}% + \ps@lympicArc(-1.5,-1.375){OlympicYellow}{30}{90}% + \ps@lympicRing(1.5,-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 + \endgroup +} \def\resetOptions{% \def\pst@linetype{0}% -- cgit v1.2.3