[Lxml-checkins] r39333 - lxml/trunk/doc

[scoder at codespeak.net]

Author: scoder
Date: Fri Feb 23 10:58:14 2007
New Revision: 39333

Modified:
   lxml/trunk/doc/main.txt
   lxml/trunk/doc/mkhtml.py
Log:
some more cleanup

Modified: lxml/trunk/doc/main.txt
==============================================================================
--- lxml/trunk/doc/main.txt	(original)
+++ lxml/trunk/doc/main.txt	Fri Feb 23 10:58:14 2007
@@ -1,6 +1,16 @@
 lxml
 ====
 
+.. contents::
+.. 
+   1  Introduction
+   2  Download
+   3  Documentation
+   4  Mailing list
+   5  License
+   6  Old Versions
+
+
 Introduction
 ------------
 

Modified: lxml/trunk/doc/mkhtml.py
==============================================================================
--- lxml/trunk/doc/mkhtml.py	(original)
+++ lxml/trunk/doc/mkhtml.py	Fri Feb 23 10:58:14 2007
@@ -66,10 +66,11 @@
             if tag[0] != '{':
                 el.tag = "{http://www.w3.org/1999/xhtml}" + tag
         current_submenu = find_submenu(menu_root, name=name)
-        for submenu in current_submenu:
-            submenu.set("style", "")
+        if current_submenu:
+            for submenu in current_submenu:
+                submenu.set("style", "")
         else:
-            print "No menu found for", name
+            print "No menu found in", name
     return tree
 
 def rest2html(script, source_path, dest_path, stylesheet_url):
@@ -96,6 +97,8 @@
         for filename in text_files:
             path = os.path.join(doc_dir, filename)
             basename = os.path.splitext(filename)[0]
+            if basename == 'main':
+                basename = 'index'
             outname = basename + '.html'
             outpath = os.path.join(dirname, outname)
 
@@ -121,8 +124,5 @@
               os.path.join(dirname, 'changes-%s.html' % release),
               stylesheet_url)
 
-    os.rename(os.path.join(dirname, 'main.html'),
-              os.path.join(dirname, 'index.html'))
-
 if __name__ == '__main__':
     publish(sys.argv[1], sys.argv[2], sys.argv[3])