[GRASS-SVN] r69588 - in grass/trunk: doc man tools
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Sep 27 12:59:11 PDT 2016
Author: wenzeslaus
Date: 2016-09-27 12:59:11 -0700 (Tue, 27 Sep 2016)
New Revision: 69588
Added:
grass/trunk/doc/gi_miscellaneous.jpg
Removed:
grass/trunk/doc/gi_misc.jpg
Modified:
grass/trunk/man/Makefile
grass/trunk/man/build_class.py
grass/trunk/man/build_class_graphical.py
grass/trunk/man/build_class_rest.py
grass/trunk/man/build_graphical_index.py
grass/trunk/man/build_html.py
grass/trunk/man/build_rest.py
grass/trunk/tools/mkhtml.py
grass/trunk/tools/mkrest.py
Log:
doc: keyword name is miscellaneous, so use it for the page as well
Parser (print_escaped_for_html_keywords()) just writes the keyword names
but the file was called misc and the keyword miscellaneous.
This makes the URL or index name harder to type manually
but it makes (first) keyword links work (for m.* modules)
and it makes the titles and link texts Miscellaneous instead
of Misc.
Deleted: grass/trunk/doc/gi_misc.jpg
===================================================================
(Binary files differ)
Copied: grass/trunk/doc/gi_miscellaneous.jpg (from rev 69541, grass/trunk/doc/gi_misc.jpg)
===================================================================
(Binary files differ)
Modified: grass/trunk/man/Makefile
===================================================================
--- grass/trunk/man/Makefile 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/man/Makefile 2016-09-27 19:59:11 UTC (rev 69588)
@@ -17,7 +17,7 @@
db:database \
g:general \
i:imagery \
- m:misc \
+ m:miscellaneous \
ps:postscript \
r:raster \
r3:raster3d \
Modified: grass/trunk/man/build_class.py
===================================================================
--- grass/trunk/man/build_class.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/man/build_class.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -10,7 +10,7 @@
from build_html import *
-no_intro_page_classes = ['display', 'general', 'misc', 'postscript']
+no_intro_page_classes = ['display', 'general', 'miscellaneous', 'postscript']
os.chdir(html_dir)
Modified: grass/trunk/man/build_class_graphical.py
===================================================================
--- grass/trunk/man/build_class_graphical.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/man/build_class_graphical.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -138,7 +138,7 @@
"Manual: Graphical index" % grass_version))
output.write(header_graphical_index_tmpl)
- if module_family.lower() not in ['general', 'misc', 'postscript']:
+ if module_family.lower() not in ['general', 'miscellaneous', 'postscript']:
if module_family == 'raster3d':
# covert keyword to nice form
module_family = '3D raster'
@@ -210,7 +210,7 @@
('db', 'database'),
('g', 'general'),
('i', 'imagery'),
- ('m', 'misc'),
+ ('m', 'miscellaneous'),
('ps', 'postscript'),
('r', 'raster'),
('r3', 'raster3d'),
Modified: grass/trunk/man/build_class_rest.py
===================================================================
--- grass/trunk/man/build_class_rest.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/man/build_class_rest.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -22,7 +22,7 @@
f = open(filename + ".tmp", 'wb')
write_rest_header(f, "GRASS GIS %s Reference Manual: %s" % (grass_version, modclass))
-if modclass.lower() not in ['general', 'misc', 'postscript']:
+if modclass.lower() not in ['general', 'miscellaneous', 'postscript']:
f.write(modclass_intro_tmpl.substitute(modclass = modclass, modclass_lower = modclass.lower()))
f.write(modclass_tmpl.substitute(modclass = modclass))
Modified: grass/trunk/man/build_graphical_index.py
===================================================================
--- grass/trunk/man/build_graphical_index.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/man/build_graphical_index.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -98,7 +98,7 @@
('imagery_graphical.html', std_img_name('imagery'), 'Imagery'),
('raster3d_graphical.html', std_img_name('raster3d'), '3D raster'),
('temporal_graphical.html', std_img_name('temporal'), 'Temporal'),
- ('misc_graphical.html', std_img_name('misc'), 'Miscellaneous'),
+ ('miscellaneous_graphical.html', std_img_name('miscellaneous'), 'Miscellaneous'),
('postscript_graphical.html', std_img_name('cartography'), 'Cartography'),
('wxGUI_graphical.html', std_img_name('gui'), 'GUI'),
('wxGUI.nviz.html', std_img_name('3dview'), '3D view'),
Modified: grass/trunk/man/build_html.py
===================================================================
--- grass/trunk/man/build_html.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/man/build_html.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -173,7 +173,7 @@
</td>
<td width="33%" valign="top" class="box"><h3> Miscellaneous & Variables</h3>
<ul>
- <li class="box"><a href="misc.html">Miscellaneous commands manual</a></li>
+ <li class="box"><a href="miscellaneous.html">Miscellaneous commands manual</a></li>
<li class="box"><a href="variables.html">GRASS variables and environment variables</a></li>
</ul>
</td>
Modified: grass/trunk/man/build_rest.py
===================================================================
--- grass/trunk/man/build_rest.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/man/build_rest.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -139,7 +139,7 @@
.. toctree::
:maxdepth: 1
- Miscellaneous commands manual <misc>
+ Miscellaneous commands manual <miscellaneous>
GRASS variables and environment variables <variables>
Temporal processing
Modified: grass/trunk/tools/mkhtml.py
===================================================================
--- grass/trunk/tools/mkhtml.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/tools/mkhtml.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -258,7 +258,7 @@
'db': 'database',
'g' : 'general',
'i' : 'imagery',
- 'm' : 'misc',
+ 'm' : 'miscellaneous',
'ps': 'postscript',
'p' : 'paint',
'r' : 'raster',
@@ -269,7 +269,7 @@
}
-# TODO: special code for ps/postscript/PostScirpt and m/misc/Miscellaneous
+# TODO: special code for ps/postscript/PostScirpt
def to_title(name):
"""Convert name of command class/family to form suitable for title"""
if name == 'raster3d':
Modified: grass/trunk/tools/mkrest.py
===================================================================
--- grass/trunk/tools/mkrest.py 2016-09-27 18:55:58 UTC (rev 69587)
+++ grass/trunk/tools/mkrest.py 2016-09-27 19:59:11 UTC (rev 69588)
@@ -99,7 +99,7 @@
'db': 'database',
'g': 'general',
'i': 'imagery',
- 'm': 'misc',
+ 'm': 'miscellaneous',
'ps': 'postscript',
'p': 'paint',
'r': 'raster',
More information about the grass-commit
mailing list