[GRASS-SVN] r63483 - in grass/branches/releasebranch_7_0: . display/d.his display/d.text display/d.where imagery/i.modis.qc lib/init ps/ps.map raster/r.category raster/r.circle raster/r.coin raster/r.covar raster/r.flow raster/r.his raster/r.mfilter raster/r.neighbors raster/r.out.gdal raster/r.out.mat raster/r.patch raster/r.reclass raster/r.stats raster/r.sunmask raster3d/r3.mkdspf vector/v.label
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 11 15:16:30 PST 2014
Author: neteler
Date: 2014-12-11 15:16:30 -0800 (Thu, 11 Dec 2014)
New Revision: 63483
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.his/d.his.html
grass/branches/releasebranch_7_0/display/d.text/d.text.html
grass/branches/releasebranch_7_0/display/d.where/d.where.html
grass/branches/releasebranch_7_0/imagery/i.modis.qc/i.modis.qc.html
grass/branches/releasebranch_7_0/lib/init/grass7.html
grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html
grass/branches/releasebranch_7_0/raster/r.category/r.category.html
grass/branches/releasebranch_7_0/raster/r.circle/r.circle.html
grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html
grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html
grass/branches/releasebranch_7_0/raster/r.flow/r.flow.html
grass/branches/releasebranch_7_0/raster/r.his/r.his.html
grass/branches/releasebranch_7_0/raster/r.mfilter/r.mfilter.html
grass/branches/releasebranch_7_0/raster/r.neighbors/r.neighbors.html
grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html
grass/branches/releasebranch_7_0/raster/r.out.mat/r.out.mat.html
grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html
grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html
grass/branches/releasebranch_7_0/raster/r.stats/r.stats.html
grass/branches/releasebranch_7_0/raster/r.sunmask/r.sunmask.html
grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/r3.mkdspf.html
grass/branches/releasebranch_7_0/vector/v.label/v.label.html
Log:
manual: minor cosmetics
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482
Modified: grass/branches/releasebranch_7_0/display/d.his/d.his.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.his/d.his.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/display/d.his/d.his.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -80,17 +80,17 @@
The name is misleading. The actual conversion used is
-<pre>
- <U>H</U>.i.s + <U>G</U>.(1-s)
+<div class="code"><pre>
+ <u>H</u>.i.s + <u>G</u>.(1-s)
where
- <U>H</U> is the R,G,B color from the hue map
+ <u>H</u> is the R,G,B color from the hue map
i is the red value from the intensity map
s is the red value from the saturation map
- <U>G</U> is 50% gray (R = G = B = 0.5)
+ <u>G</u> is 50% gray (R = G = B = 0.5)
-</pre>
+</pre></div>
<p>
Either (but not both) of the intensity or the saturation
@@ -100,7 +100,7 @@
<p>Users wishing to store the result in new raster map layers
instead of displaying it on the monitor should use the
-program <em><a href="r.his.html">r.his</a></em>.
+command <em><a href="r.his.html">r.his</a></em>.
<h2>EXAMPLE</h2>
Modified: grass/branches/releasebranch_7_0/display/d.text/d.text.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.text/d.text.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/display/d.text/d.text.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -70,7 +70,7 @@
active frame's vertical space per line:
<p>
-<pre>
+<div class="code"><pre>
<b>d.text</b> << EOF
.C yellow
.G grey
@@ -78,7 +78,7 @@
.B 1
This is a test of d.text
EOF
-</pre>
+</pre></div>
The user presses <em>control-d</em>
Modified: grass/branches/releasebranch_7_0/display/d.where/d.where.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.where/d.where.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/display/d.where/d.where.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -15,11 +15,11 @@
<p>Mouse buttons:
-<pre>
+<div class="code"><pre>
Left: where am i
Middle: draw to/from here
Right: quit this
-</pre>
+</pre></div>
The left mouse button prints the coordinates at the selected point,
the middle mouse button allows you to query two points (they are connected
Modified: grass/branches/releasebranch_7_0/imagery/i.modis.qc/i.modis.qc.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.modis.qc/i.modis.qc.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/imagery/i.modis.qc/i.modis.qc.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>
-<em>i.modis.qc</em> Extracts Requested Quality Assessment flags from the
+<em>i.modis.qc</em> extracts Requested Quality Assessment flags from the
following MODIS products: MOD09A1, MOD09Q1, MOD11A1, MOD11A2, MOD13A2,
MCD43B2. This does include MOD09A1 QA_state_500m layer (see Notes).
Modified: grass/branches/releasebranch_7_0/lib/init/grass7.html
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/grass7.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/lib/init/grass7.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -58,11 +58,11 @@
<i>Note</i>: These parameters must be specified in one of the
following ways:
-<pre>
+<div class="code"><pre>
MAPSET
LOCATION_NAME/MAPSET
GISDBASE/LOCATION_NAME/MAPSET
-</pre>
+</pre></div>
<h2>DESCRIPTION</h2>
Modified: grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html
===================================================================
--- grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -189,12 +189,12 @@
<h2>border</h2>
Controls the border which is drawn around the map area.
-<pre>
+<div class="code"><pre>
USAGE: <b>border</b> [y|n]
<b>color</b> color
<b>width</b> #
<b>end</b>
-</pre>
+</pre></div>
The <b>color</b> may be either a standard GRASS color, a R:G:B triplet,
or "none". The width is specified in points, unless followed by an "i"
in which case it is measured in inches.
@@ -205,20 +205,20 @@
main command will be treated as a single line instruction.
<p>
This example would create a grey border 0.1" wide.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>border</b>
<b>color</b> grey
<b>width</b> 0.1i
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="colortable"></a>
<h2>colortable</h2>
Prints the color table legend for the raster map layer anywhere on the page.
-<pre>
+<div class="code"><pre>
USAGE: <b>colortable</b> [y|n]
<b>where</b> x y
<b>raster</b> raster map
@@ -233,7 +233,7 @@
<b>tickbar</b> [y|N]
<b>discrete</b> [y|n]
<b>end</b>
-</pre>
+</pre></div>
For a categorical (CELL) map the color table will create a legend displaying
the colors for each of a raster map's category values along with its
@@ -301,27 +301,27 @@
<br>
<p>This example would print a color table immediately below any other map legend
information, starting at the left margin, with 4 columns:
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>colortable</b> y
<b>cols</b> 4
<b>width</b> 4
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="comments"></a>
<h2>comments</h2>
Prints comments anywhere on the page.
-<pre>
+<div class="code"><pre>
USAGE: <b>comments</b> commentfile
<b>where</b> x y
<b>font</b> font name
<b>fontsize</b> font size
<b>color</b> text color
<b>end</b>
-</pre>
+</pre></div>
The default location is immediately below the last item item printed,
starting at the left margin. The default text color is black.
<p>If you wish to use parentheses spanning multiple lines you will need to
@@ -333,7 +333,7 @@
whatever is in the file <em>veg.comments</em> starting at
1.5 inches from the left edge of the page and 7.25 inches from the top of
the page, using a 15/72 inch Helvetica Bold font.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>raster</b> vegetation
<b>comments</b> veg.comments
@@ -342,7 +342,7 @@
<b>fontsize</b> 15
<b>color</b> blue
<b>end</b>
-</pre>
+</pre></div>
Presumably, the file
<em>veg.comments</em>
contain comments
@@ -354,9 +354,9 @@
<h2>copies</h2>
Specifies the number of copies to be printed.
-<pre>
+<div class="code"><pre>
USAGE: <b>copies</b> n
-</pre>
+</pre></div>
Each page will be printed n times.
<p>This instruction is identical to the <em>copies</em> command line parameter.
<p>
@@ -365,7 +365,7 @@
<h2>eps</h2>
Places EPS (Encapsulated PostScript) pictures on the output map.
-<pre>
+<div class="code"><pre>
USAGE: <b>eps</b> east north
<b>eps</b> x% y%
<b>epsfile</b> EPS file
@@ -373,7 +373,7 @@
<b>rotate</b> #
<b>masked</b> [y|n]
<b>end</b>
-</pre>
+</pre></div>
The EPS picture location is entered in the main
instruction line by giving either the map
coordinates or by using percentages of the geographic region.
@@ -391,7 +391,7 @@
at the point (E456000 N7890000). This picture would be
rotated 20 degrees clockwise, 3 times bigger than
in original file and would not be masked by the current mask.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>eps</b> 456000 7890000
<b>epsfile</b> ./epsf/logo.eps
@@ -399,7 +399,7 @@
<b>rotate</b> 20
<b>masked</b> n
<b>end</b>
-</pre>
+</pre></div>
Of course, multiple EPS pictures may be drawn with multiple
<em>eps</em>
instructions.
@@ -409,7 +409,7 @@
<h2>geogrid</h2>
Overlays a geographic grid onto the output map.
-<pre>
+<div class="code"><pre>
USAGE: <b>geogrid</b> spacing unit
<b>color</b> color
<b>numbers</b> # [color]
@@ -417,7 +417,7 @@
<b>fontsize</b> font size
<b>width</b> #
<b>end</b>
-</pre>
+</pre></div>
The <b>spacing</b> and spacing unit of the geographic grid is given
on the main instruction line. The <b>spacing</b> unit is given as one of <b>d</b> for
degrees, <b>m</b> for minutes, and <b>s</b> for seconds.
@@ -438,22 +438,22 @@
This example would overlay a blue geographic grid with a spacing of 30 minutes
onto the output map. Alternate grid
lines would be numbered with yellow numbers.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>geogrid</b> 30 m
<b>color</b> blue
<b>numbers</b> 2 yellow
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="greyrast"></a>
<h2>greyrast</h2>
Selects a raster map layer for output in shades of grey.
-<pre>
+<div class="code"><pre>
USAGE: <b>greyrast</b> mapname
-</pre>
+</pre></div>
For each
<em>ps.map</em>
run, only one raster map layer can be requested (using either the
@@ -464,7 +464,7 @@
<h2>grid</h2>
Overlays a coordinate grid onto the output map.
-<pre>
+<div class="code"><pre>
USAGE: <b>grid</b> spacing
<b>color</b> color
<b>numbers</b> # [color]
@@ -473,7 +473,7 @@
<b>fontsize</b> font size
<b>width</b> #
<b>end</b>
-</pre>
+</pre></div>
The <b>spacing</b> of the grid is given (in the geographic coordinate
system units) on the main instruction line. The subsection instructions
allow the user to specify
@@ -490,22 +490,22 @@
This example would overlay a green grid with a spacing of 10000 meters
(for a metered database, like UTM) onto the output map. Alternate grid
lines would be numbered with red numbers.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>grid</b> 10000
<b>color</b> green
<b>numbers</b> 2 red
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="group"></a>
<h2>group</h2>
Selects an RGB imagery group for output.
-<pre>
+<div class="code"><pre>
USAGE: <b>group</b> <em>groupname</em>
-</pre>
+</pre></div>
This is similar to <em>raster</em>, except that it uses an imagery group
instead of a raster map layer. The group must contain three raster map
layers, comprising the red, green and blue bands of the image.
@@ -515,14 +515,14 @@
<h2>header</h2>
Prints the map header above the map.
-<pre>
+<div class="code"><pre>
USAGE: <b>header</b>
<b>file</b> header file
<b>font</b> font name
<b>fontsize</b> font size
<b>color</b> text color
<b>end</b>
-</pre>
+</pre></div>
If the <em>file</em> sub-instruction is absent the header will consist
of the map's title <!-- from hist file -->
and the location's description.<!-- PERMANENT/MYNAME -->
@@ -563,7 +563,7 @@
<p>
This example prints (in red) whatever is in the file <em>soils.hdr</em> above
the map, using a 20/72 inch <tt>Courier</tt> font.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>header</b>
<b>file</b> soils.hdr
@@ -571,7 +571,7 @@
<b>fontsize</b> 20
<b>color</b> red
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="labels"></a>
@@ -581,35 +581,35 @@
<em>
<a href="v.label.html">v.label</a>
).</em>
-<pre>
+<div class="code"><pre>
USAGE: <b>labels</b> labelfile
<b>font</b> font name
<b>end</b>
-</pre>
+</pre></div>
<p>NOTE: ps.map can read new option 'ROTATE:' from labels file, which
specifies counter clockwise rotation in degrees.
<p>This example would paint labels from the labels file called
<em>town.names</em>. Presumably, these labels would indicate the names of
towns on the map.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>labels</b> town.names
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="line"></a>
<h2>line</h2>
Draws lines on the output map.
-<pre>
+<div class="code"><pre>
USAGE: <b>line</b> east north east north
<b>line</b> x% y% x% y%
<b>color</b> color
<b>width</b> #
<b>masked</b> [y|n]
<b>end</b>
-</pre>
+</pre></div>
The beginning and ending points of the line are entered on the main
instruction. These points can be defined either by map coordinates or
by using percentages of the geographic region.
@@ -626,14 +626,14 @@
to the point x=30% y=70%.
This line would be 2 points wide (2/72") and would appear even if
there is a mask.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>line</b> 10% 80% 30% 70%
<b>color</b> yellow
<b>width</b> 2
<b>masked</b> n
<b>end</b>
-</pre>
+</pre></div>
Of course, multiple lines may be drawn with multiple
<em>line</em>
instructions.
@@ -644,7 +644,7 @@
Prints the portion of the map legend containing the scale, grid and
region information, on or below the map.
-<pre>
+<div class="code"><pre>
USAGE: <b>mapinfo</b>
<b>where</b> x y
<b>font</b> font name
@@ -653,7 +653,7 @@
<b>background</b> box color|none
<b>border</b> color|none
<b>end</b>
-</pre>
+</pre></div>
The default location is immediately below the map,
starting at the left edge of the map.
The default text color is black.
@@ -665,7 +665,7 @@
immediately below the map and starting 1.5 inches from the left edge
of the page, using a 12/72 inch <tt>Courier</tt> font.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>mapinfo</b>
<b>where</b> 1.5 0
@@ -673,16 +673,16 @@
<b>fontsize</b> 12
<b>color</b> brown
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="maploc"></a>
<h2>maploc</h2>
Positions the map on the page.
-<pre>
+<div class="code"><pre>
USAGE: <b>maploc</b> x y [width height]
-</pre>
+</pre></div>
The upper left corner of the map will be positioned <em>x</em> inches from
the left edge of the page and <em>y</em> inches from the top of the page.
If <em>width</em> and <em>height</em> (in inches) are present, the map will be
@@ -691,31 +691,31 @@
<p>
This example positions the upper left corner of the map 2.0 inches from
the left edge and 3.5 inches from the top edge of the map.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>maploc</b> 2.0 3.5
-</pre>
+</pre></div>
<p>
<a name="maskcolor"></a>
<h2>maskcolor</h2>
Color to be used for mask.
-<pre>
+<div class="code"><pre>
USAGE: <b>maskcolor</b> color
-</pre>
+</pre></div>
<a name="outline"></a>
<h2>outline</h2>
Outlines the areas of a raster map layer with a specified color.
-<pre>
+<div class="code"><pre>
USAGE: <b>outline</b>
<b>color</b> color
<b>width</b> width of line in points
<b>end</b>
-</pre>
+</pre></div>
Distinct areas of the raster map will be separated from each other visually
by drawing a border (or outline) in the specified
<b>color</b>
@@ -733,21 +733,21 @@
<em>soils</em>
raster map layer
in grey.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>raster</b> soils
<b>outline</b>
<b>color</b> grey
<b>width</b> 2
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="paper"></a>
<h2>paper</h2>
Specifies paper size and margins.
-<pre>
+<div class="code"><pre>
USAGE: <b>paper</b> paper name
<b>height</b> #
<b>width</b> #
@@ -756,7 +756,7 @@
<b>bottom</b> #
<b>top</b> #
<b>end</b>
-</pre>
+</pre></div>
<b>paper</b> may select predefined paper name
(a4,a3,a2,a1,a0,us-legal,us-letter,us-tabloid).
Default paper size is a4. The measures are defined in <em>inches</em>.
@@ -764,12 +764,13 @@
If the plot is rotated with the <b>-r</b> command line flag, measures
are applied to the <em>rotated</em> page.
<p>
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>paper</b> a3
<b>end</b>
-</pre>
-<p><pre>
+</pre></div>
+<p>
+<div class="code"><pre>
EXAMPLE:
<b>paper</b>
<b>width</b> 10
@@ -779,14 +780,14 @@
<b>bottom</b> 2
<b>top</b> 2
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="point"></a>
<h2>point</h2>
Places additional points or icons on the output map.
-<pre>
+<div class="code"><pre>
USAGE: <b>point</b> east north
<b>point</b> x% y%
<b>color</b> color
@@ -797,7 +798,7 @@
<b>rotate</b> #
<b>masked</b> [y|n]
<b>end</b>
-</pre>
+</pre></div>
The point location is entered in the main instruction line by giving either
the map coordinates or by using percentages of the geographic region.
The user may also specify the point <b>color</b>,
@@ -813,7 +814,7 @@
<p>This example would place a purple diamond (from icon file
<em>diamond</em>) at the point (E456000 N7890000). This diamond would be the
the size of a 15 points and would not be masked by the current mask.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>point</b> 456000 7890000
<b>fcolor</b> purple
@@ -822,7 +823,7 @@
<b>size</b> 15
<b>masked</b> n
<b>end</b>
-</pre>
+</pre></div>
Of course, multiple points may be drawn with multiple
<em>point</em>
instructions.
@@ -839,23 +840,23 @@
will not search for this file. The user must be in the
correct directory or specify the full path on the <b>psfile</b> instruction.
(Note to /bin/csh users: ~ won't work with this instruction).
-<pre>
+<div class="code"><pre>
USAGE: <b>psfile</b> filename
-</pre>
+</pre></div>
This example copies the file "logo.ps" into the output file.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>psfile</b> logo.ps
-</pre>
+</pre></div>
<p>
<a name="raster"></a>
<h2>raster</h2>
Selects a raster map layer for output.
-<pre>
+<div class="code"><pre>
USAGE: <b>raster</b> mapname
-</pre>
+</pre></div>
For each <em>ps.map</em> run, only one raster map layer (or set
of layers or imagery group; see below) can be requested. If no
raster map layer is requested, a completely white map will be
@@ -869,19 +870,19 @@
title, which in turn may be set with the <em>r.suppport</em> module.
<p>This example would paint a map of the raster map layer <em>soils</em>.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>raster</b> soils
-</pre>
+</pre></div>
<p>
<a name="read"></a>
<h2>read</h2>
Provides <em>ps.map</em> with a previously prepared input stream.
-<pre>
+<div class="code"><pre>
USAGE: <b>read</b> previously prepared UNIX file
-</pre>
+</pre></div>
Mapping instructions can be placed into a file and read into
<em>ps.map.</em>
@@ -896,10 +897,10 @@
This example reads the UNIX file <em>pmap.roads</em> into <em>ps.map</em>.
This file may contain all the <em>ps.map</em> instructions for placing
the vector map layer <em>roads</em> onto the output map.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>read</b> pmap.roads
-</pre>
+</pre></div>
The user may have created this file because this vector map layer
is particularly useful for many <em>ps.map</em>
outputs. By using the <b>read</b> option, the user need not enter all the input
@@ -911,7 +912,7 @@
<h2>rectangle</h2>
Draws rectangle on the output map.
-<pre>
+<div class="code"><pre>
USAGE: <b>rectangle</b> east north east north
<b>rectangle</b> x% y% x% y%
<b>color</b> color
@@ -919,7 +920,7 @@
<b>width</b> #
<b>masked</b> [y|n]
<b>end</b>
-</pre>
+</pre></div>
The two corners of the rectangle are entered on the main
instruction. These points can be defined either by map coordinates or
by using percentages of the geographic region.
@@ -938,7 +939,7 @@
This example would draw a yellow rectangle filled by green from the point x=10% y=80%
to the point x=30% y=70%.
The border line would be 1/16" wide and would appear even if there is a mask.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>rectangle</b> 10% 80% 30% 70%
<b>color</b> yellow
@@ -946,7 +947,7 @@
<b>width</b> 0.0625i
<b>masked</b> n
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="region"></a>
@@ -954,12 +955,12 @@
Places the outline of a smaller geographic region
on the output.
-<pre>
+<div class="code"><pre>
USAGE: <b>region</b> regionfile
<b>color</b> color
<b>width</b> #
<b>end</b>
-</pre>
+</pre></div>
Geographic region settings are created and saved using <em> the
<a href="g.region.html">g.region</a></em> module.
The <em>ps.map</em> <em>region</em> option can be used to show an outline of
@@ -973,22 +974,22 @@
geographic region called <em>fire.zones</em> onto the output map.
This geographic region would have been created and saved using
<em><a href="g.region.html">g.region</a></em>.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>region</b> fire.zones
<b>color</b> white
<b>width</b> 2
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="rgb"></a>
<h2>rgb</h2>
Selects three raster map layers for output as an RGB color image.
-<pre>
+<div class="code"><pre>
USAGE: <b>rgb</b> <em>red</em> <em>green</em> <em>blue</em>
-</pre>
+</pre></div>
This is similar to <em>raster</em>, except that it uses three
raster map layers instead of a single layer. The three layers
are composed to form a color image, similar to <em>d.rgb</em>.
@@ -1004,9 +1005,9 @@
<h2>scale</h2>
Selects a scale for the output map.
-<pre>
+<div class="code"><pre>
USAGE: <b>scale</b> <em>scale</em>
-</pre>
+</pre></div>
The scale can be selected either as:
<dl>
<dt>
@@ -1024,17 +1025,17 @@
<p>
This example would set the scale of the map to 1 unit = 25000
units.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>scale</b> 1:25000
-</pre>
+</pre></div>
<p>
<a name="scalebar"></a>
<h2>scalebar</h2>
Draws a scalebar on the map.
-<pre>
+<div class="code"><pre>
USAGE: <b>scalebar</b> [f|s]
<b>where</b> x y
<b>length</b> overall distance in map units
@@ -1045,7 +1046,7 @@
<b>fontsize</b> font size
<b>background</b> [Y|n]
<b>end</b>
-</pre>
+</pre></div>
Draw one of two types of scale bar.
Fancy (f) draws alternating black and white scale boxes.
Simple (s) draws a plain line scale. The default type is fancy.
@@ -1069,7 +1070,7 @@
like UTM) long, with tics every 200 meters, labeled every second tic.
The scalebar is drawn 5 inches from the top and 4 inches from the left
and is 0.25 inches high.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>scalebar</b> s
<b>where</b> 4 5
@@ -1078,7 +1079,7 @@
<b>segment</b> 5
<b>numbers</b> 2
<b>end</b>
-</pre>
+</pre></div>
<a name="setcolor"></a>
@@ -1086,18 +1087,18 @@
Overrides the color assigned to one or more categories
of the raster map layer.
-<pre>
+<div class="code"><pre>
USAGE: <b>setcolor</b> cat(s) color
-</pre>
+</pre></div>
This example would set the color for categories 2,5 and 8 of the raster
map layer <em>watersheds</em> to white and category 10 to green.
(<b>NOTE</b>: no spaces are inserted between the category values.)
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>raster</b> watersheds
<b>setcolor</b> 2,5,8 white
<b>setcolor</b> 10 green
-</pre>
+</pre></div>
Of course, <em>setcolor</em>
can be requested more than once to override the default color for additional
categories. More than one category can be changed for each request by listing
@@ -1110,7 +1111,7 @@
<h2>text</h2>
Places text on the map.
-<pre>
+<div class="code"><pre>
USAGE: <b>text</b> east north text
<b>text</b> x% y% text
<b>font</b> fontname
@@ -1128,7 +1129,7 @@
<b>yoffset</b> #
<b>opaque</b> [y|n]
<b>end</b>
-</pre>
+</pre></div>
The user specifies where the text will be placed by
providing map coordinates or percentages of the geographic region.
The text follows these coordinates on the same instruction line.
@@ -1182,7 +1183,7 @@
background enclosed in a red box, and be 500 meters in size. The lower right
corner of the text would be centered over the coordinates provided. All
vectors on the map would stop at the border of this text.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>text</b> 650000 7365000 SPEARFISH LAND COVER
<b>font</b> romand
@@ -1196,14 +1197,14 @@
<b>ref</b> lower left
<b>opaque</b> y
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="vareas"></a>
<h2>vareas</h2>
Selects a vector map layer for output and plots areas.
-<pre>
+<div class="code"><pre>
USAGE: <b>vareas</b> vectormap
<b>layer</b> # (layer number used with cats/where option)
<b>cats</b> list of categories (e.g. 1,3,5-7)
@@ -1219,7 +1220,7 @@
<b>pwidth</b> #
<b>scale</b> #
<b>end</b>
-</pre>
+</pre></div>
The user can specify:
<p><b>color</b> - color of the vector lines or area boundaries;
<p><b>fcolor</b> - the area fill color;
@@ -1268,7 +1269,7 @@
<p><b>pwidth</b> - pattern line width, width is used by pattern until the width is overwritten
in pattern file.
<p>
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>vareas</b> forest
<b>color</b> blue
@@ -1276,14 +1277,14 @@
<b>masked</b> y
<b>cats</b> 2,5-7
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="vlines"></a>
<h2>vlines</h2>
Selects a vector map layer for output and plots lines.
-<pre>
+<div class="code"><pre>
USAGE: <b>vlines</b> vectormap
<b>type</b> line and/or boundary
<b>layer</b> # (layer number used with cats/where option)
@@ -1304,7 +1305,7 @@
<b>label</b> label
<b>lpos</b> #
<b>end</b>
-</pre>
+</pre></div>
The user can specify:
<p><b>type</b> - the default is lines only;
<p><b>color</b> - color of the vector lines or area boundaries;
@@ -1350,7 +1351,7 @@
same lpos then their symbols in legend are merged and label for
first vector is used.
<p>
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>vlines</b> streams
<b>color</b> blue
@@ -1361,14 +1362,14 @@
<b>cats</b> 2
<b>label</b> Streams - category 2
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="vpoints"></a>
<h2>vpoints</h2>
Selects vector point data to be placed on the output map
-<pre>
+<div class="code"><pre>
USAGE: <b>vpoints</b> vectormap
<b>type</b> point and/or centroid
<b>layer</b> # (layer number used with cats/where/sizecol options)
@@ -1389,7 +1390,7 @@
<b>label</b> legend label
<b>lpos</b> position in legend
<b>end</b>
-</pre>
+</pre></div>
The user may specify the
the <b>color</b> of the sites (see section on <a href="#NAMED_COLORS">NAMED COLORS</a>);
either the GRASS <b>symbol</b> or
@@ -1405,14 +1406,14 @@
In a similar manner symbol color can be read from <b>rgbcolumn</b>
and the rotation angle read from <b>rotatecolumn</b>.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>vpoints</b> windmills
<b>color</b> blue
<b>symbol</b> mills/windmill
<b>size</b> 10
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="vlegend"></a>
<h2>vlegend</h2>
@@ -1420,7 +1421,7 @@
Prints the portion of the map legend containing the
vector information, on or below the map.
-<pre>
+<div class="code"><pre>
USAGE: <b>vlegend</b>
<b>where</b> x y
<b>font</b> font name
@@ -1430,7 +1431,7 @@
<b>span</b> column separation
<b>border</b> color|none
<b>end</b>
-</pre>
+</pre></div>
The default location is immediately below the legend containing the
scale, grid and region information, starting at the left edge of the map.
If the <em>where</em> instruction is present and <em>y</em> is less than or
@@ -1456,14 +1457,14 @@
immediately below the map and starting 4.5 inches from the left edge
of the page, using a 12/72 inch Helvetica font.
-<pre>
+<div class="code"><pre>
EXAMPLE:
<b>vlegend</b>
<b>where</b> 4.5 0
<b>font</b> Courier
<b>fontsize</b> 12
<b>end</b>
-</pre>
+</pre></div>
<p>
<a name="end"></a>
@@ -1471,9 +1472,9 @@
Terminates input and begin painting the map.
-<pre>
+<div class="code"><pre>
USAGE: <b>end</b>
-</pre>
+</pre></div>
<br>
<p>
@@ -1484,7 +1485,7 @@
<p><h3>Simple example</h3>
The file has been named <em>spear.basic</em>:
-<pre>
+<div class="code"><pre>
# this ps.map example draws a map of Spearfish, SD
<b>raster</b> elevation.dem
<b>header</b>
@@ -1493,18 +1494,18 @@
<b>color</b> brown
<b>end</b>
<b>end</b>
-</pre>
+</pre></div>
Generate map as Postsript file:
-<pre>
+<div class="code"><pre>
ps.map input=spear.basic output=spear_basic.ps
-</pre>
+</pre></div>
<h3>More complicated example</h3>
The file has been named <em>spear.soils</em>:
-<pre>
+<div class="code"><pre>
# this ps.map example draws a map of Spearfish, SD
<b>raster</b> soils
<b>outline</b>
@@ -1569,7 +1570,7 @@
<b>paper</b> a4
<b>end</b>
<b>end</b>
-</pre>
+</pre></div>
This script file can be entered at the command line:
Modified: grass/branches/releasebranch_7_0/raster/r.category/r.category.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.category/r.category.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.category/r.category.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -55,18 +55,18 @@
The coefficient line can be followed by explicit category labels
which override the format label generation.
-<pre>
+<div class="code"><pre>
0:no data
2: .
5: . ## explicit category labels
7: .
-</pre>
+</pre></div>
explicit labels can be also of the form:
-<pre>
+<div class="code"><pre>
5.5:5:9 label description
or
15:30 label description
-</pre>
+</pre></div>
<p>In the format line
<ul>
<li>$1 refers to the value num*5.0+1000 (ie, using the first 2 coefficients)
Modified: grass/branches/releasebranch_7_0/raster/r.circle/r.circle.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.circle/r.circle.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.circle/r.circle.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -19,16 +19,16 @@
Generate a raster circle at current map center with a radius of 300m and outwardly
increasing raster values:
-<pre>
+<div class="code"><pre>
EASTCENTER=`g.region -c | awk ' /center easting:/ { print $3 }'`
NORTHCENTER=`g.region -c | awk ' /center northing:/ { print $3 }'`
r.circle output=circle coordinate=${EASTCENTER},${NORTHCENTER} max=300
-</pre>
+</pre></div>
Generate a binary raster ring around current map center with an inner radius
of 500m and an outer radius of 1000m:
-<pre>
+<div class="code"><pre>
EASTCENTER=`g.region -c | awk ' /center easting:/ { print $3 }'`
NORTHCENTER=`g.region -c | awk ' /center northing:/ { print $3 }'`
r.circle -b output=circle coordinate=${EASTCENTER},${NORTHCENTER} min=500 max=1000
Modified: grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -107,7 +107,7 @@
<p>Following is a sample report.
-<pre>
+<div class="code"><pre>
+------------------------------------------------------------+
| COINCIDENCE TABULATION REPORT |
|------------------------------------------------------------|
@@ -159,7 +159,7 @@
|--------------------------------|
|w/o 0 | 14.58 | 14.58 |
+--------------------------------+
-</pre>
+</pre></div>
<p>
<em>r.coin</em> calculates the coincidence of two raster
Modified: grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -32,21 +32,21 @@
would produce a 3x3 matrix (values are example only):
-<pre>
+<div class="code"><pre>
1.000000 0.914922 0.889581
0.914922 1.000000 0.939452
0.889581 0.939452 1.000000
-</pre>
+</pre></div>
In the above example, the eigen values and corresponding eigen vectors
for the covariance matrix are:
-<pre>
+<div class="code"><pre>
component eigen value eigen vector
1 1159.745202 < 0.691002 0.720528 0.480511 >
2 5.970541 < 0.711939 -0.635820 -0.070394 >
3 146.503197 < 0.226584 0.347470 -0.846873 >
-</pre>
+</pre></div>
The component corresponding to each vector can be produced using
<em><a href="r.mapcalc.html">r.mapcalc</a></em>
Modified: grass/branches/releasebranch_7_0/raster/r.flow/r.flow.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.flow/r.flow.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.flow/r.flow.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -141,16 +141,16 @@
<h3>Diagnostics</h3>
-<pre>
+<div class="code"><pre>
Elevation raster map resolution differs from current region resolution
-</pre>
+</pre></div>
The resolutions of all input raster maps and the current region must
match (see <em><a href="g.region.html">g.region</a></em>).
-<pre>
+<div class="code"><pre>
Resolution too unbalanced
-</pre>
+</pre></div>
The difference in length between the two axes of a grid cell is so
great that quantization error is larger than one of the
Modified: grass/branches/releasebranch_7_0/raster/r.his/r.his.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.his/r.his.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.his/r.his.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -57,7 +57,7 @@
The name is misleading. The actual conversion used is
-<pre>
+<div class="code"><pre>
<u>H</u>.i.s + <u>G</u>.(1-s)
where
@@ -67,7 +67,7 @@
s is the red value from the saturation map
<u>G</u> is 50% gray (R = G = B = 0.5)
-</pre>
+</pre></div>
<p>
Either (but not both) of the intensity or the saturation
Modified: grass/branches/releasebranch_7_0/raster/r.mfilter/r.mfilter.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.mfilter/r.mfilter.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.mfilter/r.mfilter.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -26,7 +26,7 @@
The <em>filter</em> file is a normal UNIX ASCII file designed by the user.
It has the following format:
-<pre>
+<div class="code"><pre>
TITLE TITLE
MATRIX n
.
@@ -34,7 +34,7 @@
.
DIVISOR d
TYPE S/P
-</pre>
+</pre></div>
<dl>
<dt>TITLE
@@ -85,7 +85,7 @@
<h2>EXAMPLE FILTER FILE</h2>
-<pre>
+<div class="code"><pre>
TITLE 3x3 average, non-null data only, followed by 5x5 average
MATRIX 3
1 1 1
@@ -102,7 +102,7 @@
1 1 1 1 1
DIVISOR 25
TYPE P
-</pre>
+</pre></div>
<h2>HOW THE FILTER WORKS</h2>
Modified: grass/branches/releasebranch_7_0/raster/r.neighbors/r.neighbors.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.neighbors/r.neighbors.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.neighbors/r.neighbors.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -222,9 +222,9 @@
When weights are used, the calculation for <b>method=average</b> is:
-<pre>
+<div class="code"><pre>
sum(w[i]*x[i]) / sum(w[i])
-</pre>
+</pre></div>
In the case where all weights are zero, this will end up with both the
numerator and denominator to zero, which produces a NULL result.
Modified: grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -29,7 +29,7 @@
The set of <a href="http://www.gdal.org/formats_list.html">supported
raster formats</a> written by <em>r.out.gdal</em> depends on the
local GDAL installation. Available may be (incomplete list):<p>
-<pre>
+<div class="code"><pre>
AAIGrid: Arc/Info ASCII Grid
BMP: MS Windows Device Independent Bitmap
BSB: Maptech BSB Nautical Charts
@@ -53,7 +53,7 @@
PNM: Portable Pixmap Format (netpbm)
VRT: Virtual Raster
XPM: X11 PixMap Format
-</pre>
+</pre></div>
<h2>NOTES</h2>
@@ -75,7 +75,7 @@
<h3>Ranges of GDAL data types</h3>
-<pre>
+<div class="code"><pre>
GDAL data type minimum maximum
Byte 0 255
@@ -85,7 +85,7 @@
Int32, CInt32 -2,147,483,648 2,147,483,647
Float32, CFloat32 -3.4E38 3.4E38
Float64, CFloat64 -1.79E308 1.79E308
-</pre>
+</pre></div>
<p>If there is a need to keep file sizes small, use the simplest data type
covering the data range of the raster(s) to be exported, e.g., if suitable
Modified: grass/branches/releasebranch_7_0/raster/r.out.mat/r.out.mat.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.mat/r.out.mat.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.out.mat/r.out.mat.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -34,7 +34,7 @@
As there is no IEEE value for <tt>NaN</tt> for integer maps, GRASS's null
value is used to represent it within these maps. You'll have to do something
like this to clean them once the map is loaded into Matlab:
-<pre> map_data(find(map_data < -1e9)) = NaN;</pre>
+<div class="code"><pre> map_data(find(map_data < -1e9)) = NaN;</pre></div>
Null values in maps containing either floating point or double-precision
floating point data should translate into <tt>NaN</tt> values as expected.
Modified: grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -27,26 +27,26 @@
with the middle (<em>patching</em>) raster map layer,
to produce the <em>composite</em> raster map layer on the right.
-<pre>
+<div class="code"><pre>
1 1 1 0 2 2 0 0 0 0 1 1 0 0 0 0 1 1 1 1 2 2 0 0
1 1 0 2 2 2 0 0 0 0 1 1 0 0 0 0 1 1 1 2 2 2 0 0
3 3 3 3 2 2 0 0 0 0 0 0 0 0 0 0 3 3 3 3 2 2 0 0
3 3 3 3 0 0 0 0 4 4 4 4 4 4 4 4 3 3 3 3 4 4 4 4
3 3 3 0 0 0 0 0 4 4 4 4 4 4 4 4 3 3 3 4 4 4 4 4
0 0 0 0 0 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
-</pre>
+</pre></div>
Switching the <em>patched</em> and the <em>patching</em> raster map layers
produces the following results:
-<pre>
+<div class="code"><pre>
0 0 1 1 0 0 0 0 1 1 1 0 2 2 0 0 1 1 1 1 2 2 0 0
0 0 1 1 0 0 0 0 1 1 0 2 2 2 0 0 1 1 1 1 2 2 0 0
0 0 0 0 0 0 0 0 3 3 3 3 2 2 0 0 3 3 3 3 2 2 0 0
4 4 4 4 4 4 4 4 3 3 3 3 0 0 0 0 4 4 4 4 4 4 4 4
4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 4 4 4 4 4 4 4 4
4 4 4 4 4 4 4 4 0 0 0 0 0 0 0 0 4 4 4 4 4 4 4 4
-</pre>
+</pre></div>
<h2>NOTES</h2>
Modified: grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -122,10 +122,10 @@
layer, and reclassifies input raster map layer categories 4 and 5 to
category 2 with the label "poor quality" in the output map layer.
-<pre>
+<div class="code"><pre>
1 2 3 = 1 good quality
4 5 = 2 poor quality
-</pre>
+</pre></div>
<p><dd>2. This example reclassifies categories 1, 3 and 5 in the input raster
@@ -133,23 +133,23 @@
map layer, and reclassifies input raster map layer categories 2, 4, and 6
to category 2 with the label "good quality" in the output map layer.
All other values are reclassified to NULL.
-<pre>
+<div class="code"><pre>
1 3 5 = 1 poor quality
2 4 6 = 2 good quality
* = NULL
-</pre>
+</pre></div>
<p><dd>3. This example reclassifies input raster map layer categories 1 thru 10 to output
map layer category 1, input map layer categories 11 thru 20 to output map layer
category 2, and input map layer categories 21 thru 30 to output map layer
category 3, all without labels. The range from 30 to 40 is reclassified as
NULL.
-<pre>
+<div class="code"><pre>
1 thru 10 = 1
11 thru 20 = 2
21 thru 30 = 3
30 thru 40 = NULL
-</pre>
+</pre></div>
<p><dd>4. Subsequent rules override previous rules. Therefore, the below example
reclassifies input raster map layer categories 1 thru 19 and 51 thru 100
@@ -157,26 +157,26 @@
input raster map layer categories 20 thru 24 and 26 thru 50 to
the output map layer category 2, and input raster map layer category 25
to the output category 3.
-<pre>
+<div class="code"><pre>
1 thru 100 = 1 poor quality
20 thru 50 = 2 medium quality
25 = 3 good quality
-</pre>
+</pre></div>
<p><dd>5. The previous example could also have been entered as:
-<pre>
+<div class="code"><pre>
1 thru 19 51 thru 100 = 1 poor quality
20 thru 24 26 thru 50 = 2 medium quality
25 = 3 good quality
-</pre>
+</pre></div>
or as:
-<pre>
+<div class="code"><pre>
1 thru 19 = 1 poor quality
51 thru 100 = 1
20 thru 24 = 2
26 thru 50 = 2 medium quality
25 = 3 good quality
-</pre>
+</pre></div>
</dd>
</dl>
<p>
Modified: grass/branches/releasebranch_7_0/raster/r.stats/r.stats.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stats/r.stats.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.stats/r.stats.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -60,12 +60,12 @@
<p> <b>r.stats input=</b>a,b,c | pr -3 | cat -s
<p>will create a three-column output
-<pre>
+<div class="code"><pre>
1:4:4:10000.00 2:1:5:290000.00 2:4:5:2090000.00
1:4:5:1340000.00 2:2:5:350000.00 3:1:2:450000.00
2:1:1:1090000.00 2:4:1:700000.00 3:1:3:5280000.00
2:1:3:410000.00 2:4:3:10000.00 3:1:5:3140000.00
-</pre>
+</pre></div>
-->
The output from <em>r.stats</em> is sorted by category or category
Modified: grass/branches/releasebranch_7_0/raster/r.sunmask/r.sunmask.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sunmask/r.sunmask.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster/r.sunmask/r.sunmask.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -38,7 +38,7 @@
Note for module usage with the <em>-g</em> flag, when performing calculations
close to sunset/sunrise:
-<pre>
+<div class="code"><pre>
[...]
sunangleabovehorizont=0.434240
sunrise=07:59:19
@@ -46,7 +46,7 @@
Time (07:59:02) is before sunrise (07:59:19)!
WARNING: Nothing to calculate. Please verify settings.
No map calculation requested. Finished.
-</pre>
+</pre></div>
In above calculation it appears to be a mistake as
the program indicates that we are before sunrise while
Modified: grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/r3.mkdspf.html
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/r3.mkdspf.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/r3.mkdspf.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -46,11 +46,11 @@
With grid3 data (<I>phdata</I>) in the range 3-7,
we only want to see isosurface values for the range 4-6.
Any of these commands will produce the same results:<br>
-<pre>
+<div class="code"><pre>
r3.mkdspf phdata dspf=iso min=4.0 max=6.0 tnum=5
r3.mkdspf phdata dspf=iso levels=4.0,4.5,5.0,5.5,6.0
r3.mkdspf phdata dspf=iso min=4.0 max=6.0 step=0.5
-</pre>
+</pre></div>
<h2>NOTE</h2>
Currently the grid3 file must be in the user's mapset since the
Modified: grass/branches/releasebranch_7_0/vector/v.label/v.label.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.label/v.label.html 2014-12-11 23:12:46 UTC (rev 63482)
+++ grass/branches/releasebranch_7_0/vector/v.label/v.label.html 2014-12-11 23:16:30 UTC (rev 63483)
@@ -56,7 +56,7 @@
centered (<em>center</em>), by default. Label placement
may be specified as:
-<pre>
+<div class="code"><pre>
lower left (lower left corner of the text)
lower right (lower right corner of the text)
lower center (bottom center of the text)
@@ -67,7 +67,7 @@
center (center of the text)
-</pre>
+</pre></div>
<dt><b>FONT</b>:
@@ -75,11 +75,12 @@
<dd>This specifies the font to use.
<p>The following fonts are available for use with
<a href="d.labels.html"><i>d.labels</i></a>:
-<p><pre>
+<p>
+<div class="code"><pre>
cyrilc gothgbt gothgrt gothitt greekc greekcs greekp greeks
italicc italiccs italict romanc romancs romand romans romant
scriptc scripts
-</pre>
+</pre></div>
<p>Alternatively the path to a FreeType (.ttf) font may be given.
(for <em>d.labels</em> only)
<p>The word <em>standard</em> can be used to specify the default font
More information about the grass-commit
mailing list