[GRASS-SVN] r59827 - in grass/trunk: db/drivers/dbf db/drivers/mysql db/drivers/odbc db/drivers/ogr db/drivers/postgres db/drivers/sqlite doc/vector general/g.parser imagery/i.atcorr lib/cairodriver lib/gis lib/htmldriver lib/pngdriver lib/psdriver macosx/app man raster/r.li raster/r.li/r.li.daemon tools vector/v.lrs
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Apr 20 03:09:22 PDT 2014
Author: martinl
Date: 2014-04-20 03:09:22 -0700 (Sun, 20 Apr 2014)
New Revision: 59827
Modified:
grass/trunk/db/drivers/dbf/grass-dbf.html
grass/trunk/db/drivers/mysql/grass-mesql.html
grass/trunk/db/drivers/mysql/grass-mysql.html
grass/trunk/db/drivers/odbc/grass-odbc.html
grass/trunk/db/drivers/ogr/grass-ogr.html
grass/trunk/db/drivers/postgres/grass-pg.html
grass/trunk/db/drivers/sqlite/grass-sqlite.html
grass/trunk/doc/vector/vector.html
grass/trunk/general/g.parser/g.parser.html
grass/trunk/imagery/i.atcorr/i.atcorr.html
grass/trunk/lib/cairodriver/cairodriver.html
grass/trunk/lib/gis/parser_html.c
grass/trunk/lib/htmldriver/htmldriver.html
grass/trunk/lib/pngdriver/pngdriver.html
grass/trunk/lib/psdriver/psdriver.html
grass/trunk/macosx/app/build_html_user_index.sh
grass/trunk/man/build_html.py
grass/trunk/man/grassdocs.css
grass/trunk/raster/r.li/r.li.daemon/r.li.daemon.html
grass/trunk/raster/r.li/r.li.html
grass/trunk/tools/mkhtml.py
grass/trunk/tools/module_synopsis.sh
grass/trunk/vector/v.lrs/lrs.html
Log:
TOC: fix names
prettify
add class for hr
Modified: grass/trunk/db/drivers/dbf/grass-dbf.html
===================================================================
--- grass/trunk/db/drivers/dbf/grass-dbf.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/db/drivers/dbf/grass-dbf.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -8,7 +8,8 @@
<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 -->
<h1>DBF driver in GRASS</h1>
@@ -145,8 +146,10 @@
<a href="http://shapelib.maptools.org/dbf_api.html">DBF Specifications</a> (Shapelib)
</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>© 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/db/drivers/mysql/grass-mesql.html
===================================================================
--- grass/trunk/db/drivers/mysql/grass-mesql.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/db/drivers/mysql/grass-mesql.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -78,8 +78,10 @@
<h2>AUTHOR</h2>
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>© 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/db/drivers/mysql/grass-mysql.html
===================================================================
--- grass/trunk/db/drivers/mysql/grass-mysql.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/db/drivers/mysql/grass-mysql.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -131,8 +131,10 @@
<h2>AUTHOR</h2>
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>© 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/db/drivers/odbc/grass-odbc.html
===================================================================
--- grass/trunk/db/drivers/odbc/grass-odbc.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/db/drivers/odbc/grass-odbc.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -8,7 +8,8 @@
<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 -->
<h1>ODBC driver in GRASS</h1>
@@ -186,7 +187,8 @@
<p>
<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>© 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/db/drivers/ogr/grass-ogr.html
===================================================================
--- grass/trunk/db/drivers/ogr/grass-ogr.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/db/drivers/ogr/grass-ogr.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -8,7 +8,8 @@
<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 -->
<h1>OGR driver in GRASS</h1>
@@ -27,8 +28,10 @@
<a href="v.external.html">v.external</a>
</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>© 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/db/drivers/postgres/grass-pg.html
===================================================================
--- grass/trunk/db/drivers/postgres/grass-pg.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/db/drivers/postgres/grass-pg.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -8,7 +8,8 @@
<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 -->
<h1>PostgreSQL DB driver in GRASS</h1>
@@ -151,7 +152,8 @@
<p>
<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>© 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/db/drivers/sqlite/grass-sqlite.html
===================================================================
--- grass/trunk/db/drivers/sqlite/grass-sqlite.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/db/drivers/sqlite/grass-sqlite.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -8,7 +8,8 @@
<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 -->
<h1>SQLite driver in GRASS</h1>
@@ -97,7 +98,8 @@
<p>
<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>© 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/doc/vector/vector.html
===================================================================
--- grass/trunk/doc/vector/vector.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/doc/vector/vector.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -98,7 +98,7 @@
<a href=v.modules.html>Vector upgrade status</a> (partially outdated)
-<hr>
+<hr class="header">
$Date$
-</BODY>
-</HTML>
+</body>
+</html>
Modified: grass/trunk/general/g.parser/g.parser.html
===================================================================
--- grass/trunk/general/g.parser/g.parser.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/general/g.parser/g.parser.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -7,7 +7,8 @@
</head>
<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>
<em><b>g.parser</b></em> - Provides full parser support for GRASS
@@ -456,7 +457,8 @@
<p>
<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>© 2003-2014 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -665,7 +665,7 @@
<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.
-<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
explained, also how to obtain an estimate for either visibility or aerosol
optical depth at 550nm.
Modified: grass/trunk/lib/cairodriver/cairodriver.html
===================================================================
--- grass/trunk/lib/cairodriver/cairodriver.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/lib/cairodriver/cairodriver.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -7,7 +7,8 @@
</head>
<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>
<em><b>Cairo driver</b></em> - display driver for bitmap or vector
Modified: grass/trunk/lib/gis/parser_html.c
===================================================================
--- grass/trunk/lib/gis/parser_html.c 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/lib/gis/parser_html.c 2014-04-20 10:09:22 UTC (rev 59827)
@@ -51,7 +51,8 @@
fprintf(stdout, "</head>\n");
fprintf(stdout, "<body bgcolor=\"white\">\n\n");
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, "<em><b>%s</b></em> ", st->pgm_name);
Modified: grass/trunk/lib/htmldriver/htmldriver.html
===================================================================
--- grass/trunk/lib/htmldriver/htmldriver.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/lib/htmldriver/htmldriver.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -7,7 +7,8 @@
</head>
<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>
Modified: grass/trunk/lib/pngdriver/pngdriver.html
===================================================================
--- grass/trunk/lib/pngdriver/pngdriver.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/lib/pngdriver/pngdriver.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -7,7 +7,8 @@
</head>
<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>
<em><b>PNG driver</b></em> - display driver to create PNG, PPM, or BMP images.
Modified: grass/trunk/lib/psdriver/psdriver.html
===================================================================
--- grass/trunk/lib/psdriver/psdriver.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/lib/psdriver/psdriver.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -7,7 +7,8 @@
</head>
<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>
<em><b>PS driver</b></em> - display driver to create PostScript files.
Modified: grass/trunk/macosx/app/build_html_user_index.sh
===================================================================
--- grass/trunk/macosx/app/build_html_user_index.sh 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/macosx/app/build_html_user_index.sh 2014-04-20 10:09:22 UTC (rev 59827)
@@ -49,7 +49,8 @@
</head>
<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>
@@ -71,7 +72,7 @@
write_html_footer()
{
# $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 "© 2003-2008 <a href=\"http://grass.osgeo.org\">GRASS Development Team</a></p>" >> $1
echo "</body>" >> $1
Modified: grass/trunk/man/build_html.py
===================================================================
--- grass/trunk/man/build_html.py 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/man/build_html.py 2014-04-20 10:09:22 UTC (rev 59827)
@@ -52,7 +52,8 @@
<!-- 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>
@@ -82,7 +83,7 @@
<td valign="top" bgcolor="${box_color}" class="box"><h3> Quick Introduction</h3>
<ul>
<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>
<p>
<ul>
@@ -90,7 +91,7 @@
</ul></td>
<td valign="top" bgcolor="${box_color}" class="box"><h3> Display/Graphical User Interfaces</h3>
<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.toolboxes.html">wxGUI toolboxes</a></li>
</ul>
@@ -165,7 +166,7 @@
#"
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>© 2003-${year} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${grass_version} Reference Manual</p>
</body>
@@ -255,7 +256,8 @@
</head>
<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>
<ul>
"""
@@ -267,7 +269,8 @@
</head>
<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>
"""
#"
@@ -278,7 +281,8 @@
</head>
<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>
<table>
Modified: grass/trunk/man/grassdocs.css
===================================================================
--- grass/trunk/man/grassdocs.css 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/man/grassdocs.css 2014-04-20 10:09:22 UTC (rev 59827)
@@ -17,6 +17,13 @@
width: 80%;
}
+hr.header {
+ height: 3px;
+ color: gray;
+ background-color: gray;
+ width: 100%;
+}
+
h1{
background-color: transparent;
color: rgb(25%, 60%, 25%);
@@ -80,6 +87,10 @@
color: rgb(25%, 60%, 25%);
}
+li.box span {
+ color: black;
+}
+
table.border {
border-collapse:collapse;
}
@@ -99,10 +110,8 @@
top: 5px;
right: 5px;
width: 17%;
- line-height: 120%;
- font-weight: bold;
font-size: small;
- font-family: arial,sans-serif;
+ border-radius: 10px;
}
li.toc {
@@ -117,6 +126,5 @@
}
a.toc {
- color: rgb(25%, 60%, 25%);
text-decoration: none;
}
Modified: grass/trunk/raster/r.li/r.li.daemon/r.li.daemon.html
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/r.li.daemon.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/raster/r.li/r.li.daemon/r.li.daemon.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -7,7 +7,8 @@
</head>
<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>
@@ -95,7 +96,7 @@
<p>
<i>Last changed: $Date$</i>
-<hr>
+<hr class="header">
<p><a href="index.html">Main index</a>
- <a href="raster.html">Raster index</a>
- <a href="topics.html">Topics index</a>
Modified: grass/trunk/raster/r.li/r.li.html
===================================================================
--- grass/trunk/raster/r.li/r.li.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/raster/r.li/r.li.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -7,7 +7,8 @@
</head>
<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>
@@ -212,7 +213,7 @@
<p>
<i>Last changed: $Date$</i>
-<hr>
+<hr class="header">
<a href="index.html">Main index</a>
- <a href="raster.html">Raster index</a>
- <a href="topics.html">Topics index</a>
Modified: grass/trunk/tools/mkhtml.py
===================================================================
--- grass/trunk/tools/mkhtml.py 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/tools/mkhtml.py 2014-04-20 10:09:22 UTC (rev 59827)
@@ -36,7 +36,8 @@
<link rel="stylesheet" href="grassdocs.css" type="text/css">
</head>
<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>
@@ -47,7 +48,7 @@
"""
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>© 2003-${YEAR} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${GRASS_VERSION} Reference Manual</p>
</body>
@@ -55,7 +56,7 @@
""")
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>© 2003-${YEAR} <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS ${GRASS_VERSION} Reference Manual</p>
</body>
@@ -116,6 +117,11 @@
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):
if not data:
@@ -144,7 +150,7 @@
in_h3 = False
fd.write('%s<li class="toc"><a href="#%s" class="toc">%s</a>' % \
- (' ' * indent, href, text))
+ (' ' * indent, escape_href(text), text))
first = False
fd.write('</li>\n</ul>\n')
@@ -152,12 +158,12 @@
def update_toc(data):
ret_data = []
- pat = re.compile(r'(<(h\d)>)(.+)(</h\d>)')
+ pat = re.compile(r'(<(h[2|3])>)(.+)(</h[2|3]>)')
idx = 1
for line in data.splitlines():
if pat.search(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
ret_data.append(line)
Modified: grass/trunk/tools/module_synopsis.sh
===================================================================
--- grass/trunk/tools/module_synopsis.sh 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/tools/module_synopsis.sh 2014-04-20 10:09:22 UTC (rev 59827)
@@ -206,7 +206,7 @@
<body bgcolor="white">
<img src="grass_logo.png" alt="_\|/_ GRASS logo">
-<hr align=center size=6 noshade>
+<hr class="header">
<!-- prettier:
<BR><BR><BR><BR>
@@ -321,7 +321,7 @@
cat << EOF >> "${TMP}.html"
</ul>
-<hr>
+<hr class="header">
<p>
<a href="index.html">Help Index</a><br>
© 2007-2010 <a href="http://grass.osgeo.org">GRASS Development Team</a>
Modified: grass/trunk/vector/v.lrs/lrs.html
===================================================================
--- grass/trunk/vector/v.lrs/lrs.html 2014-04-20 08:12:20 UTC (rev 59826)
+++ grass/trunk/vector/v.lrs/lrs.html 2014-04-20 10:09:22 UTC (rev 59827)
@@ -8,7 +8,8 @@
</head>
<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) -->
<h2>LRS (Linear Referencing System)</h2>
@@ -197,8 +198,10 @@
Radim Blazek, ITC-irst/MPA Solutions Trento<br>
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>© 2003-2014 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
</body>
More information about the grass-commit
mailing list