pst-moire (15nov18)

git-svn-id: svn://tug.org/texlive/trunk@49167 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 16 insertions, 50 deletions

diff --git a/Master/texmf-dist/dvips/pst-moire/pst-moire.pro b/Master/texmf-dist/dvips/pst-moire/pst-moire.pro
index 59fd37da5e6..38996bf0ed9 100644
--- a/Master/texmf-dist/dvips/pst-moire/pst-moire.pro
+++ b/Master/texmf-dist/dvips/pst-moire/pst-moire.pro
@@ -68,21 +68,23 @@ grestore
 } def
 %
 /pst-linear {
-Runit neg 0 translate
 /trait {
     newpath
     0 Runit neg moveto
     0 Runit lineto
     linecolor
     linewidth
+%    Tr 2 div setlinewidth
     stroke
     }
 def
 gsave
-0 1 NombreTraits 1 add{% 50 traits espacés de 2 mm
-    trait
-    mm 2 mul 0 translate
-    } for
+Runit neg 0 translate
+  trait
+ nr {
+  Tr 0 translate
+  trait
+} repeat
 grestore
 } def
 %
@@ -133,21 +135,17 @@ grestore
 }def
 %
 /pst-circle {
-/Circle {
-    newpath
-    0 0 Radius 0 360 arc
-    closepath
+    gsave
+/rad 1 mm mul def
+1 1 nr {/rad exch def
+    /radius rad Tr mul def
+    circle     
     linecolor
     linewidth
     stroke
-    }def
-    gsave
-0 1 NombreTraits 2 div {% 50 carrés espacés de 2 mm
-    /Radius exch mm 2 mul mul def
-    Circle
     } for
 grestore
-} def
+} def 
 %
 /pst-Bouasse{
 /grille {
@@ -171,40 +169,11 @@ reduc reduc scale
 grestore
 } def
 %
-/pst-Gauss1{% definition obsolete
-10 dict begin
-/a 0.5 def
-/yStart -10 def
-/yStop 10 def 
-/TRAME {
--15 0.5 15 { % le nombre de traits
-    /k exch def
-    /p 2.71828 0.5 k a mul dup mul mul neg exp m k a mul mul sub def
-    /xStart 10 neg p sub m div def
-    /xStop 10 p sub m div def
-    linecolor
-    linewidth
-    newpath
-    xStart unit yStart unit moveto
-    xStop unit yStop unit lineto
-    stroke
-} for
-} def
-/CIRCLE {0 0 Runit 0 360 arc } def
-gsave
-CIRCLE clip
-    90 Alpha sub rotate
-    TRAME
-grestore
-end
-} def
-%
 /pst-Gauss {
 0 0 translate
 10 dict begin
 /A1 3 def
 /K1 0.5 def
-%/E1 0.25 def
 /TRAME {
 -40 E1 2 mul 40 {/n exch def
 gsave
@@ -219,12 +188,9 @@ gsave
 grestore
      } for
 } def
-Runit neg Runit neg moveto
-Runit neg Runit lineto
-Runit Runit lineto
-Runit Runit neg lineto
-Runit neg Runit neg lineto
-clip
+Runit neg dup
+Runit 2 mul dup
+rectclip
     TRAME
 end
 } def