1 files changed, 32 insertions, 28 deletions

diff --git a/doc/build/components/pydoc.myt b/doc/build/components/pydoc.myt
index bf7a6952a..b787ae74f 100644
--- a/doc/build/components/pydoc.myt
+++ b/doc/build/components/pydoc.myt
@@ -1,44 +1,42 @@
+<%doc>pydoc.myt - provides formatting functions for printing docstring.AbstractDoc generated python documentation objects.</%doc>
+
 <%global>
-    import docstring, string, sys
+import docstring
 </%global>
 
 <%method obj_doc>
     <%args>
         obj
+        toc
+        extension
     </%args>
-
-<%python>
+<%init>
 if obj.isclass:
-    s = []
     links = []
     for elem in obj.inherits:
         if isinstance(elem, docstring.ObjectDoc):
-            links.append("<a href=\"#%s\">%s</a>" % (str(elem.id), elem.name))
-            s.append(elem.name)
+            links.append(m.scomp("nav.myt:toclink", toc=toc, path=elem.toc_path, extension=extension, description=elem.name))
         else:
             links.append(str(elem))
-            s.append(str(elem))
-    description = "class " + obj.classname + "(%s)" % (','.join(s))
     htmldescription = "class " + obj.classname + "(%s)" % (','.join(links))
 else:
-    description = obj.description
     htmldescription = obj.description
-    
-</%python>
-<&|doclib.myt:item, name=obj.name, description=description, htmldescription=htmldescription, altlink=str(obj.id) &>
+
+</%init>
+
+<&|formatting.myt:section, toc=toc, path=obj.toc_path, description=htmldescription &>
+
 <&|formatting.myt:formatplain&><% obj.doc %></&>
 
 % if not obj.isclass and obj.functions:
-<&|doclib.myt:item, name="modfunc", description="Module Functions" &>
-<&|formatting.myt:paramtable&>
+
 %   for func in obj.functions:
     <& SELF:function_doc, func=func &>
 %
-</&>
-</&>
+
 % else:
+
 % if obj.functions:
-<&|formatting.myt:paramtable&>
 %   for func in obj.functions:
 %   if isinstance(func, docstring.FunctionDoc):
     <& SELF:function_doc, func=func &>
@@ -46,26 +44,26 @@ else:
     <& SELF:property_doc, prop=func &>
 %
 %
-</&>
 %
 %
 
 % if obj.classes:
-<&|formatting.myt:paramtable&>
 %   for class_ in obj.classes:
-      <& SELF:obj_doc, obj=class_ &>
+      <& SELF:obj_doc, obj=class_, toc=toc, extension=extension &>
 %   
-</&>
 %    
 </&>
-
 </%method>
 
 <%method function_doc>
     <%args>func</%args>
-    <&|formatting.myt:function_doc, name=func.name, link=func.link, arglist=func.arglist &>
-    <&|formatting.myt:formatplain&><% func.doc %></&>
-    </&>
+        <div class="darkcell">
+        <A name=""></a>
+        <b><% func.name %>(<% ", ".join(map(lambda k: "<i>%s</i>" % k, func.arglist))%>)</b>
+        <div class="docstring">
+        <&|formatting.myt:formatplain&><% func.doc %></&>
+        </div>
+        </div>
 </%method>
 
 
@@ -73,7 +71,13 @@ else:
     <%args>
         prop
     </%args>
-    <&|formatting.myt:member_doc, name=prop.name, link=prop.link &>
-    <&|formatting.myt:formatplain&><% prop.doc %></&>
-    </&>    
+         <div class="darkcell">
+         <A name=""></a>
+         <b><% prop.name %></b>
+         <div class="docstring">
+         <&|formatting.myt:formatplain&><% prop.doc %></&>
+         </div> 
+         </div>
 </%method>
+
+