--- a/make/indexsections.py	Sun Dec 12 16:47:22 2010 -0600
+++ b/make/indexsections.py	Sun Dec 12 16:48:45 2010 -0600
@@ -32,7 +32,9 @@
     # This recurses to call this function again, printing out different data.
 
     if tag[0] == "put_index_here":
-      if not idx: process(data, 1)
+      if not idx:
+        if title: print title
+        process(data, 1)
       continue
 
     # Parse one of our magic "span" tags describing a section.
@@ -44,7 +46,11 @@
       tag = tag[1][3:]
       if tag[0]=='"' and tag[-1]=='"': tag=tag[1:-1]
       if debug: sys.stderr.write("tag %s\n" % tag)
-      spans.append("_".join(tag.split()))
+
+      temp = "_".join(tag.split())
+      temp = "_".join(temp.split("/"))
+      temp = "".join(temp.split("?"))
+      spans.append(temp)
       secnum[-1] += 1
       secstr = ".".join(map(lambda a: str(a), secnum))
 
@@ -82,13 +88,23 @@
   if idx: adjust_depth(0, depth)
 
 baseurl=None
-if len(sys.argv) == 4 and sys.argv[1] == '-b':
-  del sys.argv[1]
-  baseurl=sys.argv[1]
-  del sys.argv[1]
+title=None
+while len(sys.argv) > 2 and sys.argv[1][0]=='-':
+  if sys.argv[1] == '-b':
+    del sys.argv[1]
+    baseurl=sys.argv[1]
+    del sys.argv[1]
+  elif sys.argv[1] == '-s':
+    del sys.argv[1]
+    baseurl = 1
+  elif sys.argv[1] == '-t':
+    del sys.argv[1]
+    title = sys.argv[1]
+    del sys.argv[1]
+  else: break
 
 if len(sys.argv) != 2:
-  sys.stderr.write("Usage: indexsections.py [-b http://baseurl] filename\n");
+  sys.stderr.write("Usage: indexsections.py [-s] [-b http://baseurl] filename\n");
   sys.exit(1)
 
 process(open(sys.argv[1]).read().split("<"), baseurl)