[GRASS-SVN] r37300 - in grass/trunk/ps/ps.map: . patterns

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-20 05:07:03 -0400 (Wed, 20 May 2009)
New Revision: 37300

Added:
   grass/trunk/ps/ps.map/patterns/horiz_zigzag.eps
   grass/trunk/ps/ps.map/patterns/railroad_down.eps
   grass/trunk/ps/ps.map/patterns/railroad_up.eps
   grass/trunk/ps/ps.map/patterns/vert_zigzag.eps
Modified:
   grass/trunk/ps/ps.map/patterns/cross_diag5.eps
   grass/trunk/ps/ps.map/patterns/diag_down.eps
   grass/trunk/ps/ps.map/patterns/diag_down6.eps
   grass/trunk/ps/ps.map/patterns/diag_down_dash.eps
   grass/trunk/ps/ps.map/patterns/diag_up.eps
   grass/trunk/ps/ps.map/patterns/diag_up6.eps
   grass/trunk/ps/ps.map/patterns/diag_up_dash.eps
   grass/trunk/ps/ps.map/ps.map.html
   grass/trunk/ps/ps.map/r_vareas.c
Log:
avoid pattern clipping (thanks for ideas Glynn, Jorge);
add new railroad and zigzag patterns;
accept 'pattern' as alias to 'pat' instruction; fix docs
 (merge from devbr6)


Modified: grass/trunk/ps/ps.map/patterns/cross_diag5.eps
===================================================================
(Binary files differ)

Modified: grass/trunk/ps/ps.map/patterns/diag_down.eps
===================================================================
(Binary files differ)

Modified: grass/trunk/ps/ps.map/patterns/diag_down6.eps
===================================================================
(Binary files differ)

Modified: grass/trunk/ps/ps.map/patterns/diag_down_dash.eps
===================================================================
(Binary files differ)

Modified: grass/trunk/ps/ps.map/patterns/diag_up.eps
===================================================================
(Binary files differ)

Modified: grass/trunk/ps/ps.map/patterns/diag_up6.eps
===================================================================
(Binary files differ)

Modified: grass/trunk/ps/ps.map/patterns/diag_up_dash.eps
===================================================================
(Binary files differ)

Copied: grass/trunk/ps/ps.map/patterns/horiz_zigzag.eps (from rev 37299, grass/branches/develbranch_6/ps/ps.map/patterns/horiz_zigzag.eps)
===================================================================
(Binary files differ)

Copied: grass/trunk/ps/ps.map/patterns/railroad_down.eps (from rev 37299, grass/branches/develbranch_6/ps/ps.map/patterns/railroad_down.eps)
===================================================================
(Binary files differ)

Copied: grass/trunk/ps/ps.map/patterns/railroad_up.eps (from rev 37299, grass/branches/develbranch_6/ps/ps.map/patterns/railroad_up.eps)
===================================================================
(Binary files differ)

Copied: grass/trunk/ps/ps.map/patterns/vert_zigzag.eps (from rev 37299, grass/branches/develbranch_6/ps/ps.map/patterns/vert_zigzag.eps)
===================================================================
(Binary files differ)

Modified: grass/trunk/ps/ps.map/ps.map.html
===================================================================
--- grass/trunk/ps/ps.map/ps.map.html	2009-05-20 08:51:36 UTC (rev 37299)
+++ grass/trunk/ps/ps.map/ps.map.html	2009-05-20 09:07:03 UTC (rev 37300)
@@ -1299,9 +1299,10 @@
 <B>pat</B> - full path to pattern file. The pattern file contains header and
 simple PostScript commands. It is similar to EPS but more limited, meaning that
 while each pattern file is a true EPS file, most EPS files are not useful as pattern
-files because they contain restricted commands. Color and width of patterns are set
-by <B>fcolor</B> (red, green, ..., none, R:G:B) and <B>width</B> until
-overwritten in the pattern file.
+files because they contain restricted commands. Color <!-- and width --> of patterns
+are set by <B>fcolor</B> (red, green, ..., none, R:G:B)<!-- no?  and <B>width</B>
+until overwritten in the pattern file -->. Color of the boundaries remain set
+by the <B>color</B> instruction.
 Pattern may be scaled with the <b>scale</b> command. Several standard hatching
 patterns are provided in <tt>$GISBASE/etc/paint/patterns/</tt>.
 Demonstrative images can be found on the

Modified: grass/trunk/ps/ps.map/r_vareas.c
===================================================================
--- grass/trunk/ps/ps.map/r_vareas.c	2009-05-20 08:51:36 UTC (rev 37299)
+++ grass/trunk/ps/ps.map/r_vareas.c	2009-05-20 09:07:03 UTC (rev 37300)
@@ -170,7 +170,7 @@
 	    continue;
 	}
 
-	if (KEY("pat")) {
+	if (KEY("pat") || KEY("pattern")) {
 	    G_chop(data);
 	    vector.layer[vec].pat = G_store(data);
 	    continue;