Clean up author and seeAlso information.

Remove download row from documentation header table and rename "History" section to "Releases" (which contains download links and is hopefully clear enough).

2 files changed, 22 insertions, 41 deletions

diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
index d6a6495..f8784ae 100755
--- a/lv2specgen/lv2specgen.py
+++ b/lv2specgen/lv2specgen.py
@@ -851,26 +851,32 @@ def specAuthors(m, subject):
             maint.add(getLiteralString(getObject(j)))
 
     doc = ''
+
+    devdoc = ''
     first = True
     for d in dev:
         if not first:
-            doc += ', '
-        doc += '<span class="author" property="doap:developer">%s</span>' % d
+            devdoc += ', '
+        devdoc += '<span class="author" property="doap:developer">%s</span>' % d
         first = False
+    if len(dev) == 1:
+        doc += '<tr><th class="metahead">Developer</th><td>%s</td></tr>' % devdoc
+    elif len(dev) > 0:
+        doc += '<tr><th class="metahead">Developers</th><td>%s</td></tr>' % devdoc
 
+    maintdoc = ''
+    first = True
     for m in maint:
         if not first:
-            doc += ', '
-        doc += '<span class="author" property="doap:maintainer">%s</span>' % m
+            maintdoc += ', '
+        maintdoc += '<span class="author" property="doap:maintainer">%s</span>' % m
         first = False
+    if len(maint) == 1:
+        doc += '<tr><th class="metahead">Maintainer</th><td>%s</td></tr>' % maintdoc
+    elif len(maint) > 0:
+        doc += '<tr><th class="metahead">Maintainers</th><td>%s</td></tr>' % maintdoc
 
-    n_authors = len(dev) + len(maint)
-    if n_authors == 0:
-        return ''
-    elif n_authors == 1:
-        return '<tr><th class="metahead">Author</th><td>' + doc + '</td></tr>'
-    else:
-        return '<tr><th class="metahead">Authors</th><td>' + doc + '</td></tr>'
+    return doc
 
 
 def specHistory(m, subject):
@@ -1140,33 +1146,9 @@ def specgen(specloc, indir, style_uri, docdir, tags, instances=False, mode="spec
 
     template = template.replace('@REVISION@', version_string)
 
-    header_path = bundle_path + '/' + basename + '.h'
-
-    releases = ''
-    if not experimental:
-        release_name = "lv2-" + basename
-        if basename == "lv2core":
-            release_name = "lv2core"
-        filename = '%s-%d.%d.tar.bz2' % (release_name, version[0], version[1])
-        url      = 'http://lv2plug.in/spec/%s' % filename
-        releases += '<a href="%s">%s</a> (<a href="%s.sig">sig</a>),' % (
-            url, filename, url)
-    if version[0] == 0:
-        releases += ' n/a (unreleased)'
-    else:
-        releases += ' <a href="http://lv2plug.in/spec">other releases</a>'
-    releases = '<tr><th class="metahead">Download</th><td>%s</td></tr>' % releases
-    template = template.replace('@RELEASES@', releases)
-
     other_files = ''
-    if os.path.exists(os.path.abspath(header_path)):
-        other_files += '<a href="' + docdir + '/%s">API documentation</a>, ' % (
-            basename + '_8h.html')
-
-        header = basename + '.h'
-        other_files += '<a href="%s">%s</a>, ' % (header, header)
-
     see_also_files = specProperties(m, spec_url, rdfs.seeAlso)
+    see_also_files.sort()
     for f in see_also_files:
         uri = str(f)
         if uri[:7] == 'file://':
@@ -1216,7 +1198,7 @@ def getNamespaces(m):
     """Return a prefix:URI dictionary of all namespaces seen during parsing"""
     nspaces = {}
     for prefix, uri in m.namespaces():
-        if not re.match('default[0-9]*', prefix):
+        if not re.match('default[0-9]*', prefix) and not prefix == 'xml':
             # Skip silly default namespaces added by rdflib
             nspaces[prefix] = uri
     return nspaces
diff --git a/lv2specgen/template.html b/lv2specgen/template.html
index a9d1ded..6d154da 100644
--- a/lv2specgen/template.html
+++ b/lv2specgen/template.html
@@ -23,7 +23,6 @@
     <table id="meta">
       <tr><th>URI</th><td><a href="@URI@">@URI@</a></td></tr>
       <tr><th>Version</th><td>@REVISION@</td></tr>
-      @RELEASES@
       <tr><th>Prefixes</th><td>@PREFIXES@</td></tr>
       <tr><th>Discuss</th><td>
           <a href="mailto:@MAIL@">@MAIL@</a>
@@ -40,7 +39,7 @@
       <li><a href="#sec-description">Description</a></li>
       <li><a href="#sec-index">Index</a></li>
       <li><a href="#sec-documentation">Documentation</a></li>
-      <li><a href="#sec-history">Version History</a></li>
+      <li><a href="#sec-releases">Releases</a></li>
     </ul>
   </div>
 
@@ -60,8 +59,8 @@
   @REFERENCE@
   </div>
 
-  <!-- HISTORY -->
-  <h2 class="sec" id="sec-history">Version History</h2>
+  <!-- RELEASES -->
+  <h2 class="sec" id="sec-releases">Releases</h2>
   <div class="content">
   @HISTORY@
   </div>