浏览代码

TOC: fix names
prettify
add class for hr


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59827 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 11 年之前
父节点
当前提交
65b2a8eb03

+ 6 - 3
db/drivers/dbf/grass-dbf.html

@@ -8,7 +8,8 @@
 
 
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <!-- meta page description: DBF driver -->
 <!-- meta page description: DBF driver -->
 <h1>DBF driver in GRASS</h1>
 <h1>DBF driver in GRASS</h1>
@@ -145,8 +146,10 @@ column names on the fly.
 <a href="http://shapelib.maptools.org/dbf_api.html">DBF Specifications</a> (Shapelib)
 <a href="http://shapelib.maptools.org/dbf_api.html">DBF Specifications</a> (Shapelib)
 </em>
 </em>
 
 
-<p><i>Last changed: $Date$</i>
-<hr>
+<p>
+<i>Last changed: $Date$</i>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 4 - 2
db/drivers/mysql/grass-mesql.html

@@ -78,8 +78,10 @@ as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.
 <h2>AUTHOR</h2>
 <h2>AUTHOR</h2>
 Radim Blazek
 Radim Blazek
 
 
-<p><i>Last changed: $Date$</i>
-<hr>
+<p>
+<i>Last changed: $Date$</i>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 4 - 2
db/drivers/mysql/grass-mysql.html

@@ -131,8 +131,10 @@ as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.
 <h2>AUTHOR</h2>
 <h2>AUTHOR</h2>
 Radim Blazek
 Radim Blazek
 
 
-<p><i>Last changed: $Date$</i>
-<hr>
+<p>
+<i>Last changed: $Date$</i>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 4 - 2
db/drivers/odbc/grass-odbc.html

@@ -8,7 +8,8 @@
 
 
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <!-- meta page description: ODBC driver -->
 <!-- meta page description: ODBC driver -->
 <h1>ODBC driver in GRASS</h1>
 <h1>ODBC driver in GRASS</h1>
@@ -186,7 +187,8 @@ which should print the database connection through ODBC to the defined RDBMS.
 <p>
 <p>
 <i>Last changed: $Date$</i>
 <i>Last changed: $Date$</i>
 
 
-<hr>
+<hr class="header">
+
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 6 - 3
db/drivers/ogr/grass-ogr.html

@@ -8,7 +8,8 @@
 
 
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <!-- meta page description: OGR driver -->
 <!-- meta page description: OGR driver -->
 <h1>OGR driver in GRASS</h1>
 <h1>OGR driver in GRASS</h1>
@@ -27,8 +28,10 @@ This driver is principally only used by <em>v.external</em>.
 <a href="v.external.html">v.external</a>
 <a href="v.external.html">v.external</a>
 </em>
 </em>
 
 
-<p><i>Last changed: $Date$</i>
-<hr>
+<p>
+<i>Last changed: $Date$</i>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 4 - 2
db/drivers/postgres/grass-pg.html

@@ -8,7 +8,8 @@
 
 
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <!-- meta page description: PostgreSQL driver -->
 <!-- meta page description: PostgreSQL driver -->
 <h1>PostgreSQL DB driver in GRASS</h1>
 <h1>PostgreSQL DB driver in GRASS</h1>
@@ -151,7 +152,8 @@ driver documentation</a></li>
 
 
 <p>
 <p>
 <i>Last changed: $Date$</i>
 <i>Last changed: $Date$</i>
-<hr>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 4 - 2
db/drivers/sqlite/grass-sqlite.html

@@ -8,7 +8,8 @@
 
 
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <!-- meta page description: SQLite driver -->
 <!-- meta page description: SQLite driver -->
 <h1>SQLite driver in GRASS</h1>
 <h1>SQLite driver in GRASS</h1>
@@ -97,7 +98,8 @@ echo "
 
 
 <p>
 <p>
 <i>Last changed: $Date$</i>
 <i>Last changed: $Date$</i>
-<hr>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 3 - 3
doc/vector/vector.html

@@ -98,7 +98,7 @@ L 3 1
 
 
 <a href=v.modules.html>Vector upgrade status</a> (partially outdated)
 <a href=v.modules.html>Vector upgrade status</a> (partially outdated)
 
 
-<hr>
+<hr class="header">
 $Date$
 $Date$
-</BODY>
-</HTML>
+</body>
+</html>

+ 4 - 2
general/g.parser/g.parser.html

@@ -7,7 +7,8 @@
 </head>
 </head>
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>NAME</h2>
 <h2>NAME</h2>
 <em><b>g.parser</b></em> - Provides full parser support for GRASS
 <em><b>g.parser</b></em> - Provides full parser support for GRASS
@@ -456,7 +457,8 @@ Glynn Clements
 
 
 <p>
 <p>
 <i>Last changed: $Date$</i>
 <i>Last changed: $Date$</i>
-<hr>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> | <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> | <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2014 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2014 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>

+ 1 - 1
imagery/i.atcorr/i.atcorr.html

@@ -665,7 +665,7 @@ the raster elevation values are used from the map.
 <p>Note that the process is computationally intensive.<br>
 <p>Note that the process is computationally intensive.<br>
 Note also, that <em>i.atcorr</em> reports solar elevation angle above horizon rather than solar zenith angle.
 Note also, that <em>i.atcorr</em> reports solar elevation angle above horizon rather than solar zenith angle.
 
 
-<h2><font color="red">REMAINING DOCUMENTATION ISSUES</font></h2>
+<h2>REMAINING DOCUMENTATION ISSUES</h2>
 1. The influence and importance of the visibility value or map should be 
 1. The influence and importance of the visibility value or map should be 
 explained, also how to obtain an estimate for either visibility or aerosol 
 explained, also how to obtain an estimate for either visibility or aerosol 
 optical depth at 550nm.
 optical depth at 550nm.

+ 2 - 1
lib/cairodriver/cairodriver.html

@@ -7,7 +7,8 @@
 </head>
 </head>
 <body bgColor=white>
 <body bgColor=white>
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>NAME</h2>
 <h2>NAME</h2>
 <em><b>Cairo driver</b></em> - display driver for bitmap or vector
 <em><b>Cairo driver</b></em> - display driver for bitmap or vector

+ 2 - 1
lib/gis/parser_html.c

@@ -51,7 +51,8 @@ void G__usage_html(void)
     fprintf(stdout, "</head>\n");
     fprintf(stdout, "</head>\n");
     fprintf(stdout, "<body bgcolor=\"white\">\n\n");
     fprintf(stdout, "<body bgcolor=\"white\">\n\n");
     fprintf(stdout,
     fprintf(stdout,
-	    "<img src=\"grass_logo.png\" alt=\"GRASS logo\"><hr align=center size=6 noshade>\n\n");
+	    "<img src=\"grass_logo.png\" alt=\"GRASS logo\">\n");
+    fprintf(stdout, "<hr class=\"header\">\n\n");
     fprintf(stdout, "<h2>%s</h2>\n", _("NAME"));
     fprintf(stdout, "<h2>%s</h2>\n", _("NAME"));
     fprintf(stdout, "<em><b>%s</b></em> ", st->pgm_name);
     fprintf(stdout, "<em><b>%s</b></em> ", st->pgm_name);
 
 

+ 2 - 1
lib/htmldriver/htmldriver.html

@@ -7,7 +7,8 @@
 </head>
 </head>
 <body bgColor=white>
 <body bgColor=white>
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>NAME</h2>
 <h2>NAME</h2>
 
 

+ 2 - 1
lib/pngdriver/pngdriver.html

@@ -7,7 +7,8 @@
 </head>
 </head>
 <body bgColor=white>
 <body bgColor=white>
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>NAME</h2>
 <h2>NAME</h2>
 <em><b>PNG driver</b></em> - display driver to create PNG, PPM, or BMP images.
 <em><b>PNG driver</b></em> - display driver to create PNG, PPM, or BMP images.

+ 2 - 1
lib/psdriver/psdriver.html

@@ -7,7 +7,8 @@
 </head>
 </head>
 <body bgColor=white>
 <body bgColor=white>
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>NAME</h2>
 <h2>NAME</h2>
 <em><b>PS driver</b></em> - display driver to create PostScript files.
 <em><b>PS driver</b></em> - display driver to create PostScript files.

+ 3 - 2
macosx/app/build_html_user_index.sh

@@ -49,7 +49,8 @@ echo " <link rel=\"stylesheet\" href=\"grassdocs.css\" type=\"text/css\">
 </head>
 </head>
 <body bgcolor=\"#FFFFFF\">
 <body bgcolor=\"#FFFFFF\">
 
 
-<img src=\"grass_logo.png\" alt=\"GRASS logo\"><hr align=center size=6 noshade>
+<img src=\"grass_logo.png\" alt=\"GRASS logo\">
+<hr class=\"header\">
 
 
 <h2>GRASS GIS $GRASSVERSION Reference Manual</h2>
 <h2>GRASS GIS $GRASSVERSION Reference Manual</h2>
 
 
@@ -71,7 +72,7 @@ GPL'ed), image processing and geographic information system (GIS).</p>
 write_html_footer()
 write_html_footer()
 {
 {
 # $1: filename
 # $1: filename
-echo "<hr>" >> $1
+echo "<hr class=\"header\">" >> $1
 echo "<p><a href=\"$GISBASE/docs/html/index.html\">Help Index</a> | <a href=\"$GISBASE/docs/html/full_index.html\">Full Index</a> | <a href=\"$HTMLDIR/addon_index.html\">Addon Index</a><br>" >> $1
 echo "<p><a href=\"$GISBASE/docs/html/index.html\">Help Index</a> | <a href=\"$GISBASE/docs/html/full_index.html\">Full Index</a> | <a href=\"$HTMLDIR/addon_index.html\">Addon Index</a><br>" >> $1
 echo "&copy; 2003-2008 <a href=\"http://grass.osgeo.org\">GRASS Development Team</a></p>" >> $1
 echo "&copy; 2003-2008 <a href=\"http://grass.osgeo.org\">GRASS Development Team</a></p>" >> $1
 echo "</body>" >> $1   
 echo "</body>" >> $1   

+ 11 - 7
man/build_html.py

@@ -52,7 +52,8 @@ r""" <link rel="stylesheet" href="grassdocs.css" type="text/css">
 
 
 <!-- this file is generated by man/build_html.py -->
 <!-- this file is generated by man/build_html.py -->
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>GRASS GIS ${grass_version} Reference Manual</h2>
 <h2>GRASS GIS ${grass_version} Reference Manual</h2>
 
 
@@ -82,7 +83,7 @@ r"""<!-- the files grass7.html & helptext.html file live in lib/init/ -->
       <td valign="top" bgcolor="${box_color}" class="box"><h3>&nbsp;Quick Introduction</h3>
       <td valign="top" bgcolor="${box_color}" class="box"><h3>&nbsp;Quick Introduction</h3>
       <ul>
       <ul>
        <li class="box"><a href="helptext.html">How to start with GRASS</a></li>
        <li class="box"><a href="helptext.html">How to start with GRASS</a></li>
-       <li class="box"> Index of <a href="topics.html">topics</a> and <a href="keywords.html">keywords</a></li>
+       <li class="box"><span>Index of <a href="topics.html">topics</a> and <a href="keywords.html">keywords</a></span></li>
       </ul>
       </ul>
      <p>
      <p>
       <ul>
       <ul>
@@ -90,7 +91,7 @@ r"""<!-- the files grass7.html & helptext.html file live in lib/init/ -->
       </ul></td>
       </ul></td>
       <td valign="top" bgcolor="${box_color}" class="box"><h3>&nbsp;Display/Graphical User Interfaces</h3>
       <td valign="top" bgcolor="${box_color}" class="box"><h3>&nbsp;Display/Graphical User Interfaces</h3>
        <ul>
        <ul>
-        <li class="box"><a href="wxGUI.html">wxGUI</a> Graphical User Interface</li>
+        <li class="box"><span><a href="wxGUI.html">wxGUI</a> Graphical User Interface</span></li>
         <li class="box"><a href="wxGUI.components.html">wxGUI components</a></li>
         <li class="box"><a href="wxGUI.components.html">wxGUI components</a></li>
         <li class="box"><a href="wxGUI.toolboxes.html">wxGUI toolboxes</a></li>
         <li class="box"><a href="wxGUI.toolboxes.html">wxGUI toolboxes</a></li>
        </ul>
        </ul>
@@ -165,7 +166,7 @@ r"""<!-- the files grass7.html & helptext.html file live in lib/init/ -->
 #"
 #"
 
 
 footer_tmpl = string.Template(\
 footer_tmpl = string.Template(\
-r"""<hr>
+r"""<hr class="header">
 <p><a href="${index_url}">Help Index</a> | <a href="topics.html">Topics Index</a> | <a href="keywords.html">Keywords Index</a> | <a href="full_index.html">Full Index</a></p>
 <p><a href="${index_url}">Help Index</a> | <a href="topics.html">Topics Index</a> | <a href="keywords.html">Keywords Index</a> | <a href="full_index.html">Full Index</a></p>
 <p>&copy; 2003-${year} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${grass_version} Reference Manual</p>
 <p>&copy; 2003-${year} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${grass_version} Reference Manual</p>
 </body>
 </body>
@@ -255,7 +256,8 @@ r"""
 </head>
 </head>
 <body style="width: 99%">
 <body style="width: 99%">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade> 
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 <h2>Topics</h2>
 <h2>Topics</h2>
 <ul>
 <ul>
 """
 """
@@ -267,7 +269,8 @@ r"""
 </head>
 </head>
 <body style="width: 99%">
 <body style="width: 99%">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade> 
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 <h2>Keywords - Index of GRASS GIS modules</h2>
 <h2>Keywords - Index of GRASS GIS modules</h2>
 """
 """
 #"
 #"
@@ -278,7 +281,8 @@ r"""
 </head>
 </head>
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade> 
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>Topic: ${keyword}</h2>
 <h2>Topic: ${keyword}</h2>
 <table>
 <table>

+ 12 - 4
man/grassdocs.css

@@ -17,6 +17,13 @@ body{
     width: 80%;
     width: 80%;
 }
 }
 
 
+hr.header {
+    height: 3px;
+    color: gray;
+    background-color: gray;
+    width: 100%;
+}
+
 h1{
 h1{
     background-color: transparent;
     background-color: transparent;
     color: rgb(25%, 60%, 25%);
     color: rgb(25%, 60%, 25%);
@@ -80,6 +87,10 @@ li.box {
     color: rgb(25%, 60%, 25%);
     color: rgb(25%, 60%, 25%);
 }
 }
 
 
+li.box span {
+    color: black;
+}
+
 table.border {
 table.border {
     border-collapse:collapse;
     border-collapse:collapse;
 }
 }
@@ -99,10 +110,8 @@ div.toc{
     top: 5px;
     top: 5px;
     right: 5px;
     right: 5px;
     width: 17%;
     width: 17%;
-    line-height: 120%;
-    font-weight: bold;
     font-size: small;
     font-size: small;
-    font-family: arial,sans-serif;
+    border-radius: 10px;
 }
 }
 
 
 li.toc {
 li.toc {
@@ -117,6 +126,5 @@ ul.toc {
 }
 }
 
 
 a.toc {
 a.toc {
-    color: rgb(25%, 60%, 25%);
     text-decoration: none;
     text-decoration: none;
 }
 }

+ 3 - 2
raster/r.li/r.li.daemon/r.li.daemon.html

@@ -7,7 +7,8 @@
 </head>
 </head>
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>NAME</h2>
 <h2>NAME</h2>
 
 
@@ -95,7 +96,7 @@ Read the COPYING file that comes with GRASS for details.
 <p>
 <p>
 <i>Last changed: $Date$</i>
 <i>Last changed: $Date$</i>
 
 
-<hr>
+<hr class="header">
 <p><a href="index.html">Main index</a>
 <p><a href="index.html">Main index</a>
  - <a href="raster.html">Raster index</a>
  - <a href="raster.html">Raster index</a>
  - <a href="topics.html">Topics index</a>
  - <a href="topics.html">Topics index</a>

+ 3 - 2
raster/r.li/r.li.html

@@ -7,7 +7,8 @@
 </head>
 </head>
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 
 
 <h2>NAME</h2>
 <h2>NAME</h2>
 
 
@@ -212,7 +213,7 @@ Commission from Faunalia Pontedera (PI)<br>
 <p>
 <p>
 <i>Last changed: $Date$</i>
 <i>Last changed: $Date$</i>
 
 
-<hr>
+<hr class="header">
 <a href="index.html">Main index</a>
 <a href="index.html">Main index</a>
  - <a href="raster.html">Raster index</a>
  - <a href="raster.html">Raster index</a>
  - <a href="topics.html">Topics index</a>
  - <a href="topics.html">Topics index</a>

+ 12 - 6
tools/mkhtml.py

@@ -36,7 +36,8 @@ header_base = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <link rel="stylesheet" href="grassdocs.css" type="text/css">
 <link rel="stylesheet" href="grassdocs.css" type="text/css">
 </head>
 </head>
 <body bgcolor="white">
 <body bgcolor="white">
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="GRASS logo">
+<hr class="header">
 """
 """
 
 
 header_nopgm = """<h2>${PGM}</h2>
 header_nopgm = """<h2>${PGM}</h2>
@@ -47,7 +48,7 @@ header_pgm = """<h2>NAME</h2>
 """
 """
 
 
 footer_index = string.Template(\
 footer_index = string.Template(\
-"""<hr>
+"""<hr class="header">
 <p><a href="index.html">Main index</a> | <a href="${INDEXNAME}.html">${INDEXNAMECAP} index</a> | <a href="topics.html">Topics index</a> | <a href="keywords.html">Keywords Index</a> | <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> | <a href="${INDEXNAME}.html">${INDEXNAMECAP} index</a> | <a href="topics.html">Topics index</a> | <a href="keywords.html">Keywords Index</a> | <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-${YEAR} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${GRASS_VERSION} Reference Manual</p>
 <p>&copy; 2003-${YEAR} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${GRASS_VERSION} Reference Manual</p>
 </body>
 </body>
@@ -55,7 +56,7 @@ footer_index = string.Template(\
 """)
 """)
 
 
 footer_noindex = string.Template(\
 footer_noindex = string.Template(\
-"""<hr>
+"""<hr class="header">
 <p><a href="index.html">Main index</a> | <a href="topics.html">Topics index</a> | <a href="keywords.html">Keywords Index</a> | <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> | <a href="topics.html">Topics index</a> | <a href="keywords.html">Keywords Index</a> | <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-${YEAR} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${GRASS_VERSION} Reference Manual</p>
 <p>&copy; 2003-${YEAR} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${GRASS_VERSION} Reference Manual</p>
 </body>
 </body>
@@ -116,6 +117,11 @@ def create_toc(src_data):
     
     
     return parser.data
     return parser.data
 
 
+def escape_href(label):
+    # remove html tags
+    label = re.sub('<[^<]+?>', '', label)
+    # replace space with underscore + lower
+    return label.replace(' ', '_').lower()
 
 
 def write_toc(data):
 def write_toc(data):
     if not data:
     if not data:
@@ -144,7 +150,7 @@ def write_toc(data):
                 in_h3 = False
                 in_h3 = False
         
         
         fd.write('%s<li class="toc"><a href="#%s" class="toc">%s</a>' % \
         fd.write('%s<li class="toc"><a href="#%s" class="toc">%s</a>' % \
-                     (' ' * indent, href, text))
+                     (' ' * indent, escape_href(text), text))
         first = False
         first = False
     
     
     fd.write('</li>\n</ul>\n')
     fd.write('</li>\n</ul>\n')
@@ -152,12 +158,12 @@ def write_toc(data):
 
 
 def update_toc(data):
 def update_toc(data):
     ret_data = []
     ret_data = []
-    pat = re.compile(r'(<(h\d)>)(.+)(</h\d>)')
+    pat = re.compile(r'(<(h[2|3])>)(.+)(</h[2|3]>)')
     idx = 1
     idx = 1
     for line in data.splitlines():
     for line in data.splitlines():
         if pat.search(line):
         if pat.search(line):
             xline = pat.split(line)
             xline = pat.split(line)
-            line = xline[1] + '<a name="%s_%d">' % (xline[2], idx) + xline[3] + '</a>' + xline[4]
+            line = xline[1] + '<a name="%s">' % escape_href(xline[3]) + xline[3] + '</a>' + xline[4]
             idx += 1
             idx += 1
         ret_data.append(line)
         ret_data.append(line)
 
 

+ 2 - 2
tools/module_synopsis.sh

@@ -206,7 +206,7 @@ cat << EOF > "${TMP}.html"
 <body bgcolor="white">
 <body bgcolor="white">
 
 
 <img src="grass_logo.png" alt="_\|/_ GRASS logo">
 <img src="grass_logo.png" alt="_\|/_ GRASS logo">
-<hr align=center size=6 noshade>
+<hr class="header">
 
 
 <!-- prettier:
 <!-- prettier:
 <BR><BR><BR><BR>
 <BR><BR><BR><BR>
@@ -321,7 +321,7 @@ done
 cat << EOF >> "${TMP}.html"
 cat << EOF >> "${TMP}.html"
 </ul>
 </ul>
 
 
-<hr>
+<hr class="header">
 <p>
 <p>
 <a href="index.html">Help Index</a><br>
 <a href="index.html">Help Index</a><br>
 &copy; 2007-2010 <a href="http://grass.osgeo.org">GRASS Development Team</a>
 &copy; 2007-2010 <a href="http://grass.osgeo.org">GRASS Development Team</a>

+ 6 - 3
vector/v.lrs/lrs.html

@@ -8,7 +8,8 @@
 </head>
 </head>
 <body bgcolor="white">
 <body bgcolor="white">
 
 
-<img src="grass_logo.png" alt="_\|/_ GRASS logo"><hr align=center size=6 noshade>
+<img src="grass_logo.png" alt="_\|/_ GRASS logo">
+<hr class="header">
 
 
 <!-- meta page description: LRS (Linear Referencing System) -->
 <!-- meta page description: LRS (Linear Referencing System) -->
 <h2>LRS (Linear Referencing System)</h2>
 <h2>LRS (Linear Referencing System)</h2>
@@ -197,8 +198,10 @@ Explanations of selected options:
 Radim Blazek, ITC-irst/MPA Solutions Trento<br>
 Radim Blazek, ITC-irst/MPA Solutions Trento<br>
 Documentation update (based on above journal article and available fragments): Markus Neteler
 Documentation update (based on above journal article and available fragments): Markus Neteler
 
 
-<p><i>Last changed: $Date$</i>
-<hr>
+<p>
+<i>Last changed: $Date$</i>
+
+<hr class="header">
 <p><a href="index.html">Main index</a> - <a href="vector.html">Vector index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p><a href="index.html">Main index</a> - <a href="vector.html">Vector index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <p>&copy; 2003-2014 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 <p>&copy; 2003-2014 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
 </body>
 </body>