# HG changeset patch
# User paulb@localhost.localdomain
# Date 1185562473 -7200
# Node ID ca350f002a7446fa9044ed6d72d1f82bea7c9883
# Parent  2700e47177c7ff7ebf6d43e43b4370b29755285c
Various documentation, parameter and output fixes.


diff -r 2700e47177c7 -r ca350f002a74 simplify/__init__.py
--- a/simplify/__init__.py	Thu Jul 26 20:26:47 2007 +0200
+++ b/simplify/__init__.py	Fri Jul 27 20:54:33 2007 +0200
@@ -26,6 +26,9 @@
 importer = Importer(sys.path)
 importer.load_from_file(builtins)
 importer.load_from_file(filename, builtins)
+
+Such importer objects are the most convenient mechanism through which the
+functionality of the simplify package may be accessed.
 """
 
 from simplify.simplified import *
@@ -38,14 +41,13 @@
 
     "An import machine, searching for and loading modules."
 
-    def __init__(self, path=None, annotate=1, fixinstances=1):
+    def __init__(self, path=None, annotate=1):
 
         """
         Initialise the importer with the given search 'path' - a list of
         directories to search for Python modules. If the optional 'annotate'
         parameter is set to a false value (unlike the default), no annotation
         will be performed.
-        false value (unlike the default), no instance fixing will be performed.
         """
 
         self.path = path or [os.getcwd()]
diff -r 2700e47177c7 -r ca350f002a74 simplify/fixinstances.py
--- a/simplify/fixinstances.py	Thu Jul 26 20:26:47 2007 +0200
+++ b/simplify/fixinstances.py	Fri Jul 27 20:54:33 2007 +0200
@@ -21,9 +21,11 @@
 
 --------
 
-To use this module, the easiest approach is to use the fix function:
+To use this module, the easiest approach is to use the fix and fix_structures
+functions:
 
-fix(module)
+fix_structures(module) # to fix the structures
+fix(module) # to fix references to the structures
 
 The more complicated approach involves instantiating a Fixer object:
 
@@ -31,6 +33,7 @@
 
 Then, applying the fixer to an existing module:
 
+fixer.process_structures(module)
 fixer.process(module)
 """
 
@@ -45,7 +48,8 @@
     depth-first, and eliminates references to superfluous instances, replacing
     them with those from each class's distinct list, if necessary.
 
-    See the simplify.fixnames.Fixer class for a description of the 
+    See the simplify.fixnames.Fixer class for a description of the mechanisms
+    used to deal with subprograms.
     """
 
     def __init__(self):
diff -r 2700e47177c7 -r ca350f002a74 simplify/viewer.py
--- a/simplify/viewer.py	Thu Jul 26 20:26:47 2007 +0200
+++ b/simplify/viewer.py	Fri Jul 27 20:54:33 2007 +0200
@@ -117,7 +117,7 @@
     .returns:hover > .popup,
     .failure:hover > .popup
     {
-       display: block;
+      display: block;
     }
 
     .summary-class {
@@ -1134,7 +1134,7 @@
             for section, subsection, labels in info:
                 self.stream.write("<div class='%s'>\n" % section)
                 for label in labels:
-                    self.stream.write("<div class='%s'>\n" % subsection)
+                    self.stream.write("<div class='%s'>" % subsection)
                     self.stream.write(label)
                     self.stream.write("</div>\n")
                 self.stream.write("</div>\n")