[GRASS-SVN] r37302 - grass/branches/releasebranch_6_4/ps/ps.map

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-20 05:25:10 -0400 (Wed, 20 May 2009)
New Revision: 37302

Modified:
   grass/branches/releasebranch_6_4/ps/ps.map/description.html
   grass/branches/releasebranch_6_4/ps/ps.map/r_vareas.c
Log:
accept 'pattern' as alias to 'pat' instruction; fix docs (merge from devbr6 part 2)


Modified: grass/branches/releasebranch_6_4/ps/ps.map/description.html
===================================================================
--- grass/branches/releasebranch_6_4/ps/ps.map/description.html	2009-05-20 09:24:18 UTC (rev 37301)
+++ grass/branches/releasebranch_6_4/ps/ps.map/description.html	2009-05-20 09:25:10 UTC (rev 37302)
@@ -1301,9 +1301,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/branches/releasebranch_6_4/ps/ps.map/r_vareas.c
===================================================================
--- grass/branches/releasebranch_6_4/ps/ps.map/r_vareas.c	2009-05-20 09:24:18 UTC (rev 37301)
+++ grass/branches/releasebranch_6_4/ps/ps.map/r_vareas.c	2009-05-20 09:25:10 UTC (rev 37302)
@@ -170,7 +170,7 @@
 	    continue;
 	}
 
-	if (KEY("pat")) {
+	if (KEY("pat") || KEY("pattern")) {
 	    G_chop(data);
 	    vector.layer[vec].pat = G_store(data);
 	    continue;