[GRASS-SVN] r49906 - in grass/trunk: lib/init tools

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Dec 25 17:26:37 EST 2011

Author: martinl
Date: 2011-12-25 14:26:36 -0800 (Sun, 25 Dec 2011)
New Revision: 49906

use for manual page from lib/init/ standard header and footer defined by mkhtml.py

Modified: grass/trunk/lib/init/Makefile
--- grass/trunk/lib/init/Makefile	2011-12-25 22:01:27 UTC (rev 49905)
+++ grass/trunk/lib/init/Makefile	2011-12-25 22:26:36 UTC (rev 49906)
@@ -28,9 +28,6 @@
 	$(ETC)/welcome \
 	$(ETC)/prompt.py \
-	$(HTMLDIR)/variables.html \
-	$(HTMLDIR)/grass7.html \
-	$(HTMLDIR)/helptext.html \
 	$(HTMLDIR)/help_loc_struct.png \
 	$(HTMLDIR)/circle_1.png \
 	$(HTMLDIR)/circle_2.png \
@@ -50,8 +47,10 @@
-default: $(FILES)
+HTMLFILES := $(wildcard *.html)
+default: $(FILES) $(patsubst %,$(HTMLDIR)/%,$(HTMLFILES))
 ifneq ($(strip $(MINGW)),)
 $(ARCH_BINDIR)/$(START_UP): grass.sh
 	@test -d $(ARCH_BINDIR) || (echo 'ARCH_BINDIR($(ARCH_BINDIR))' not found; exit 1)
@@ -111,8 +110,5 @@
 	chmod +r $@
-$(HTMLDIR)/%: %
-	$(INSTALL_DATA) $< $@
 $(ETC)/%: %
 	$(INSTALL) $< $@

Modified: grass/trunk/lib/init/grass7.html
--- grass/trunk/lib/init/grass7.html	2011-12-25 22:01:27 UTC (rev 49905)
+++ grass/trunk/lib/init/grass7.html	2011-12-25 22:26:36 UTC (rev 49906)
@@ -1,19 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
- <title>GRASS 7</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <link rel="stylesheet" href="grassdocs.css" type="text/css">
+<!-- meta page description: GRASS startup program -->
-<body bgcolor="white">
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
-<em><b>grass70</b></em>  - The GRASS startup program.<br>
 <b>grass70</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
@@ -348,8 +334,3 @@
 <i>Last changed: $Date$</i>
-<p><a href="index.html">Help Index</a>
-<p>&copy; 2003-2011 <a href="http://grass.osgeo.org">GRASS Development Team</a></p>

Modified: grass/trunk/lib/init/helptext.html
--- grass/trunk/lib/init/helptext.html	2011-12-25 22:01:27 UTC (rev 49905)
+++ grass/trunk/lib/init/helptext.html	2011-12-25 22:26:36 UTC (rev 49906)
@@ -1,20 +1,4 @@
- <meta name="Author" content="Markus Neteler/GRASS Development Team">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>GRASS Quickstart</title>
- <link rel="stylesheet" href="grassdocs.css" type="text/css">
-<body bgcolor="#ffffff">
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
-<!-- stored in SVN in: lib/init/helptext.html -->
 <!-- meta page description: GRASS Quickstart -->
-<H1>GRASS Quickstart</H1>
 <h2>Geographic Resources Analysis Support System</h2>
 Commonly referred to as GRASS, this is a Geographic Information System
@@ -26,9 +10,11 @@
 <h2>1. Startup of GRASS GIS</h2>
-<p>&nbsp;&nbsp;&nbsp;<IMG SRC="grass_start.png" ALT="[GRASS start screen]">
+  <img src="grass_start.png" alt="[GRASS start screen]">
-<h3><IMG SRC="circle_1.png" ALT="[(1)]">&nbsp;Selecting the GIS Database directory</h3>
+<h3><img src="circle_1.png" alt="[(1)]">&nbsp;Selecting the GIS Database directory</h3>
 GRASS data are stored in a directory referred to as DATABASE
 (also called "GISDBASE").  This directory has to be created
@@ -36,25 +22,25 @@
 with GRASS.  Within this DATABASE, the projects are organized
 by project areas stored in subdirectories called LOCATIONs.
-<h3><IMG SRC="circle_2.png" ALT="[(2)]">&nbsp;Selecting the LOCATION (a project)</h3>
+<h3><img src="circle_2.png" alt="[(2)]">&nbsp;Selecting the LOCATION (a project)</h3>
 A LOCATION is defined by its coordinate system, map projection and
 geographical boundaries. The subdirectories and files defining a
 LOCATION are created automatically when GRASS is started the first
 time with a new LOCATION. It is important to understand that each
 projection stays in its own LOCATION.
-<p>See <IMG SRC="circle_4.png" ALT="[(4)]">&nbsp; the "Location Wizard" to
+<p>See <img src="circle_4.png" alt="[(4)]">&nbsp; the "Location Wizard" to
 easily create a new LOCATION from scratch from a geocoded file, by
 defining the parameters or by selecting the corresponding EPSG projection
-<h3><IMG SRC="circle_3.png" ALT="[(3)]">&nbsp;Selecting the MAPSET (a subproject)</h3>
+<h3><img src="circle_3.png" alt="[(3)]">&nbsp;Selecting the MAPSET (a subproject)</h3>
 Each LOCATION can have many MAPSETs. Each MAPSET is a LOCATION's
 subdirectory. New MAPSET can be added at GRASS startup (see related
-<h3><IMG SRC="circle_4.png" ALT="[(4)]">&nbsp;Location Wizard</h3>
+<h3><img src="circle_4.png" alt="[(4)]">&nbsp;Location Wizard</h3>
 The "Location Wizard" let's you easily create a new LOCATION. You
 will be guided through a series of dialogues to browse and select
@@ -62,7 +48,7 @@
 projections. Find below some rules to define the default raster
 resolution for a new LOCATION.
-<h3><IMG SRC="circle_5.png" ALT="[(5)]">&nbsp;Start GRASS</h3>
+<h3><img src="circle_5.png" alt="[(5)]">&nbsp;Start GRASS</h3>
 Once you have selected an existing LOCATION/MAPSET or defined a new
 one, you can enter GRASS. The graphical user interface 
@@ -72,15 +58,17 @@
 <h2>2. Background GRASS Location structure</h2>
-<p>&nbsp;&nbsp;&nbsp;<IMG SRC="help_loc_struct.png" ALT="[GRASS Location structure]">
-<i>Fig. 1: GRASS Location structure</i>
+  <img src="help_loc_struct.png" alt="[GRASS Location structure]"><br>
+  <i>Fig. 1: GRASS Location structure</i>
 A LOCATION is simply a set of directories which contains the GRASS
 data of a project. Within each LOCATION, a mandatory "PERMANENT"
-MAPSET exists which contains projection information and some
-more definitions. It can be used to store the base cartography
-in it as "PERMANENT" is visible to all users accessing a LOCATION.
+MAPSET exists which contains projection information and some more
+definitions. It can be used to store the base cartography in it as
+"PERMANENT" is visible to all users accessing a LOCATION.
 <h3>Creating and maintaining MAPSETs</h3>
 One motivation to maintain different MAPSETs is to store maps
@@ -202,13 +190,10 @@
 <a href="http://grass.osgeo.org/gdp/index.php">http://grass.osgeo.org/gdp/index.php</a>.
 <h2>See also</h2>
-<a href="index.html">GRASS 7 Reference Manual</a>
-<a href="grass7.html">Manual page of GRASS 7 launch program</a>
-<p><i>Last changed: $Date$</i>
-<p><a href=index.html>Help Index</a>
-<p>&copy; 2005-2010 <a href="http://grass.osgeo.org">GRASS Development Team</a>
+  <a href="grass7.html">GRASS startup program</a>
+<i>Last changed: $Date$</i>

Modified: grass/trunk/lib/init/variables.html
--- grass/trunk/lib/init/variables.html	2011-12-25 22:01:27 UTC (rev 49905)
+++ grass/trunk/lib/init/variables.html	2011-12-25 22:26:36 UTC (rev 49906)
@@ -1,20 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<title>GRASS variables and environment variables</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="grassdocs.css" type="text/css">
-<body bgcolor="white">
-<!-- file source: lib/init/variables.html -->
-<img src="grass_logo.png" alt="_\|/_ GRASS logo"><hr align=center size=6 noshade>
 <!-- meta page description: GRASS variables and environment variables -->
-<h2>GRASS variables and environment variables</h2>
 There are two types of variables:
 <li><a href="#enviro">shell environment</a> variables,</li>
@@ -465,12 +449,5 @@
   <a href="g.parser.html">g.parser</a>
-<p><i>Last changed: $Date$</i>
-<p><a href=index.html>Help Index</a>
-<p>&copy; 2008-2011 <a href="http://grass.osgeo.org">GRASS Development Team</a>
+<i>Last changed: $Date$</i>

Modified: grass/trunk/tools/mkhtml.py
--- grass/trunk/tools/mkhtml.py	2011-12-25 22:01:27 UTC (rev 49905)
+++ grass/trunk/tools/mkhtml.py	2011-12-25 22:26:36 UTC (rev 49906)
@@ -75,6 +75,9 @@
 src_data = read_file(src_file)
+name = re.search('(<!-- meta page name:)(.*)(-->)', src_data, re.IGNORECASE)
+if name:
+    pgm = name.group(2).strip().split('-', 1)[0].strip()
 desc = re.search('(<!-- meta page description:)(.*)(-->)', src_data, re.IGNORECASE)
 if desc:
     pgm = desc.group(2).strip()

More information about the grass-commit mailing list