[Synopsis-changes] Synopsis/Synopsis/Synopsis/Formatters/HTML/Pages __init__.py,NONE,1.1 DirBrowse.py,1.13,1.14 FileDetails.py,1.6,1.7 FileIndexer.py,1.6,1.7 FileListing.py,1.5,1.6 FileSource.py,1.8,1.9 FileTreeJS.py,1.11,1.12 FramesIndex.py,1.11,1.12 InheritanceGraph.py,1.28,1.29 InheritanceTree.py,1.14,1.15 JSTree.py,1.7,1.8 ModuleIndexer.py,1.17,1.18 ModuleListing.py,1.15,1.16 ModuleListingJS.py,1.13,1.14 NameIndex.py,1.14,1.15 RawFile.py,1.11,1.12 Scope.py,1.25,1.26 XRef.py,1.15,1.16
Stefan Seefeld stefan at synopsis.fresco.orgSun Nov 16 21:09:48 UTC 2003
- Previous message: [Synopsis-changes] Synopsis/Synopsis/Synopsis Config.py,1.24,NONE
- Next message: [Synopsis-changes] Synopsis/Synopsis/Synopsis/Formatters/HTML/Parts Detail.py,1.1,1.2 Heading.py,1.2,1.3 Inheritance.py,1.2,1.3 Summary.py,1.2,1.3
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages
In directory frida:/tmp/cvs-serv8394/Synopsis/Formatters/HTML/Pages
Modified Files:
DirBrowse.py FileDetails.py FileIndexer.py FileListing.py
FileSource.py FileTreeJS.py FramesIndex.py InheritanceGraph.py
InheritanceTree.py JSTree.py ModuleIndexer.py ModuleListing.py
ModuleListingJS.py NameIndex.py RawFile.py Scope.py XRef.py
Added Files:
__init__.py
Log Message:
more refactoring. It's starting to work again :-)
--- NEW FILE: __init__.py ---
# $Id: __init__.py,v 1.1 2003/11/16 21:09:45 stefan Exp $
#
# Copyright (C) 2000 Stephen Davies
# Copyright (C) 2000 Stefan Seefeld
# All rights reserved.
# Licensed to the public under the terms of the GNU LGPL (>= 2),
# see the file COPYING for details.
#
Index: DirBrowse.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/DirBrowse.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- DirBrowse.py 16 Nov 2003 01:45:27 -0000 1.13
+++ DirBrowse.py 16 Nov 2003 21:09:45 -0000 1.14
@@ -36,20 +36,20 @@ class DirBrowse(Page):
"""Returns the output filename for the given input directory"""
if dir is self.__start:
- return self.processor.file_layout.nameOfSpecial('dir')
+ return self.processor.file_layout.special('dir')
scope = string.split(rel(self.__start, dir), os.sep)
- return self.processor.file_layout.nameOfScopedSpecial('dir', scope)
+ return self.processor.file_layout.scoped_special('dir', scope)
def register(self, processor):
"""Registers a page for each file in the hierarchy"""
Page.register(self, processor)
- self.__filename = self.processor.file_layout.nameOfSpecial('dir')
+ self.__filename = self.processor.file_layout.special('dir')
self.__title = 'Directory Listing'
self.__start = self.__base = processor.output
processor.set_main_page(self.__filename)
- self.processor.addRootPage(self.__filename, 'Files', 'main', 2)
+ self.processor.add_root_page(self.__filename, 'Files', 'main', 2)
def register_filenames(self, start):
"""Registers a page for every directory"""
@@ -89,19 +89,19 @@ class DirBrowse(Page):
# Start the file
self.start_file()
- self.write(self.processor.formatHeader(self.filename(), 1))
+ self.write(self.processor.navigation_bar(self.filename(), 1))
# Write intro stuff
root = rel(self.__base, self.__start)
if not len(root) or root[-1] != '/': root = root + '/'
if path is self.__start:
self.write('<h1> '+root)
else:
- self.write('<h1>'+href(file_layout.nameOfSpecial('dir'), root + ' '))
+ self.write('<h1>'+href(file_layout.special('dir'), root + ' '))
dirscope = []
scope = string.split(rel(self.__start, path), os.sep)
for dir in scope[:-1]:
dirscope.append(dir)
- dirlink = file_layout.nameOfScopedSpecial('dir', dirscope)
+ dirlink = file_layout.scoped_special('dir', dirscope)
dirlink = rel(self.filename(), dirlink)
self.write(href(dirlink, dir+'/ '))
if len(scope) > 0:
@@ -130,7 +130,7 @@ class DirBrowse(Page):
if stat.S_ISDIR(info[stat.ST_MODE]):
# A directory, process now
scope = string.split(rel(self.__start, entry_path), os.sep)
- linkpath = file_layout.nameOfScopedSpecial('dir', scope)
+ linkpath = file_layout.scoped_special('dir', scope)
linkpath = rel(self.filename(), linkpath)
self.write('<tr><td>%s</td><td></td><td align="right">%s</td></tr>\n'%(
href(linkpath, entry+'/'),
@@ -141,7 +141,7 @@ class DirBrowse(Page):
for path, entry, info in files:
size = info[stat.ST_SIZE]
timestr = time.asctime(time.gmtime(info[stat.ST_MTIME]))
- linkpath = file_layout.nameOfFileSource(path)
+ linkpath = file_layout.file_source(path)
rego = self.processor.filename_info(linkpath)
if rego:
linkurl = rel(self.filename(), linkpath)
Index: FileDetails.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/FileDetails.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- FileDetails.py 14 Nov 2003 17:39:04 -0000 1.6
+++ FileDetails.py 16 Nov 2003 21:09:45 -0000 1.7
@@ -26,8 +26,7 @@ class FileDetails(Page):
Page.register(self, processor)
self.__filename = ''
self.__title = ''
- self.__link_source = processor.has_page(FileSource)
- print 'link source', self.__link_source
+ self.__link_source = processor.has_page('FileSource')
def filename(self):
"""since FileTree generates a whole file hierarchy, this method returns the current filename,
@@ -46,7 +45,7 @@ class FileDetails(Page):
for filename, file in self.processor.ast.files().items():
if file.is_main():
- filename = self.processor.file_layout.nameOfFileDetails(filename)
+ filename = self.processor.file_layout.file_details(filename)
self.processor.register_filename(filename, self, file)
def process(self, start):
@@ -61,18 +60,18 @@ class FileDetails(Page):
containing a list of declarations."""
# set up filename and title for the current page
- self.__filename = self.processor.file_layout.nameOfFileDetails(filename)
+ self.__filename = self.processor.file_layout.file_details(filename)
# (get rid of ../'s in the filename)
name = string.split(filename, os.sep)
while len(name) and name[0] == '..': del name[0]
self.__title = string.join(name, os.sep)+' Details'
self.start_file()
- self.write(self.processor.formatHeader(self.filename()))
+ self.write(self.processor.navigation_bar(self.filename()))
self.write(entity('h1', string.join(name, os.sep))+'<br>')
if self.__link_source:
link = rel(self.filename(),
- self.processor.file_layout.nameOfFileSource(filename))
+ self.processor.file_layout.file_source(filename))
self.write(href(link, '[File Source]', target="main")+'<br>')
# Print list of includes
@@ -89,7 +88,7 @@ class FileDetails(Page):
if include.is_next(): idesc = 'include_next '
else: idesc = 'include '
if include.is_macro(): idesc = idesc + 'from macro '
- link = rel(self.filename(), self.processor.file_layout.nameOfFileDetails(target_filename))
+ link = rel(self.filename(), self.processor.file_layout.file_details(target_filename))
self.write(idesc + href(link, target_filename)+'<br>')
except:
pass
Index: FileIndexer.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/FileIndexer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- FileIndexer.py 14 Nov 2003 17:39:04 -0000 1.6
+++ FileIndexer.py 16 Nov 2003 21:09:45 -0000 1.7
@@ -45,7 +45,7 @@ class FileIndexer(Page):
for filename, file in self.processor.ast.files().items():
if file.is_main():
- filename = self.processor.file_layout.nameOfFileIndex(filename)
+ filename = self.processor.file_layout.file_index(filename)
self.processor.register_filename(filename, self, file)
def process(self, start):
@@ -60,7 +60,7 @@ class FileIndexer(Page):
containing a list of declarations."""
# set up filename and title for the current page
- self.__filename = self.processor.file_layout.nameOfFileIndex(filename)
+ self.__filename = self.processor.file_layout.file_index(filename)
# (get rid of ../'s in the filename)
name = string.split(filename, os.sep)
while len(name) and name[0] == '..': del name[0]
@@ -70,11 +70,11 @@ class FileIndexer(Page):
self.write(entity('b', string.join(name, os.sep))+'<br>')
if self.__link_source:
link = rel(self.filename(),
- self.processor.file_layout.nameOfFileSource(filename))
+ self.processor.file_layout.file_source(filename))
self.write(href(link, '[File Source]', target="main")+'<br>')
if self.__link_details:
link = rel(self.filename(),
- self.processor.file_layout.nameOfFileDetails(filename))
+ self.processor.file_layout.file_details(filename))
self.write(href(link, '[File Details]', target="main")+'<br>')
comments = self.processor.comments
Index: FileListing.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/FileListing.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- FileListing.py 14 Nov 2003 17:39:04 -0000 1.5
+++ FileListing.py 16 Nov 2003 21:09:45 -0000 1.6
@@ -24,13 +24,13 @@ class FileListing(Page):
def register(self, processor):
Page.register(self, processor)
- self.__filename = self.processor.file_layout.nameOfSpecial('FileListing')
+ self.__filename = self.processor.file_layout.special('FileListing')
self.__title = 'Files'
processor.set_main_page(self.filename())
# Reset filename in case we got main page status
- self.__filename = self.processor.file_layout.nameOfSpecial('FileListing')
- self.processor.addRootPage(self.filename(), self.title(), "contents", 2)
+ self.__filename = self.processor.file_layout.special('FileListing')
+ self.processor.add_root_page(self.filename(), self.title(), "contents", 2)
processor.set_contents_page(self.filename())
def filename(self):
@@ -49,17 +49,17 @@ class FileListing(Page):
self.processor.register_filename(self.__filename, self, None)
def process(self, start):
- """Creates the listing using the recursive processFileTreeNode method"""
+ """Creates the listing using the recursive process_file_tree_node method"""
# Init tree
self.tree = self.processor.tree_formatter
self.tree.register(self)
# Start the file
self.start_file()
- self.write(self.processor.formatHeader(self.filename(), 2))
+ self.write(self.processor.navigation_bar(self.filename(), 2))
self.tree.start_tree()
# recursively visit all nodes
- self.processFileTreeNode(processor.fileTree.root())
+ self.process_file_tree_node(self.processor.file_tree.root())
self.tree.end_tree()
self.end_file()
@@ -73,7 +73,7 @@ class FileListing(Page):
return cmp(b_leaf, a_leaf)
return cmp(string.upper(a.path), string.upper(b.path))
- def processFileTreeNode(self, node):
+ def process_file_tree_node(self, node):
"""Creates a portion of the tree for the given file node. This method
assumes that the file is already in progress, and just appends to
it. This method is recursive, calling itself for each child of node
@@ -81,7 +81,7 @@ class FileListing(Page):
if isinstance(node, FileTree.File):
# Leaf node
- ref = rel(self.filename(), self.processor.file_layout.nameOfFileIndex(node.path))
+ ref = rel(self.filename(), self.processor.file_layout.file_index(node.path))
text = href(ref, node.filename, target='index')
self.tree.write_leaf(text)
return
@@ -92,6 +92,6 @@ class FileListing(Page):
self.tree.write_node_start(node.filename+os.sep)
if len(children):
for child in children:
- self.processFileTreeNode(child)
+ self.process_file_tree_node(child)
if len(node.path):
self.tree.write_node_end()
Index: FileSource.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/FileSource.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- FileSource.py 15 Nov 2003 19:01:53 -0000 1.8
+++ FileSource.py 16 Nov 2003 21:09:45 -0000 1.9
@@ -49,7 +49,7 @@ class FileSource(Page):
# Get the TOC
toc = self.processor.get_toc(start)
- tocfile = self.processor.file_layout.nameOfSpecial('FileSourceInputTOC')
+ tocfile = self.processor.file_layout.special('FileSourceInputTOC')
tocfile = os.path.join(self.processor.output, tocfile)
toc.store(tocfile)
self.__toclist.append(tocfile)
@@ -67,7 +67,7 @@ class FileSource(Page):
if file.is_main():
filename = file.filename()
filename = os.path.join(self.processor.output, filename)
- filename = self.processor.file_layout.nameOfFileSource(filename)
+ filename = self.processor.file_layout.file_source(filename)
#print "Registering",filename
self.processor.register_filename(filename, self, file)
@@ -77,7 +77,7 @@ class FileSource(Page):
# Start page
filename = file.filename()
filename = os.path.join(self.processor.output, filename)
- self.__filename = self.processor.file_layout.nameOfFileSource(filename)
+ self.__filename = self.processor.file_layout.file_source(filename)
#name = list(node.path)
#while len(name) and name[0] == '..': del name[0]
#source = string.join(name, os.sep)
@@ -92,7 +92,7 @@ class FileSource(Page):
toclist[index] = toclist[index]+'|'+prefix
self.start_file()
- self.write(self.processor.formatHeader(self.filename()))
+ self.write(self.processor.navigation_bar(self.filename()))
self.write('File: '+entity('b', self.__title))
if not link:
@@ -107,7 +107,7 @@ class FileSource(Page):
# Call link module
f_out = os.path.join(self.processor.output, self.__filename) + '-temp'
f_in = file.full_filename()
- f_link = self.linkpath%source
+ f_link = self.links_path%source
#print "file: %s link: %s out: %s"%(f_in, f_link, f_out)
try:
link.link(toclist, f_in, f_out, f_link, self.scope)
Index: FileTreeJS.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/FileTreeJS.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- FileTreeJS.py 15 Nov 2003 19:01:53 -0000 1.11
+++ FileTreeJS.py 16 Nov 2003 21:09:45 -0000 1.12
@@ -22,8 +22,8 @@ class FileTree(JSTree):
def register(self, processor):
JSTree.register(self, processor)
- filename = self.processor.file_layout.nameOfSpecial('FileTree')
- self.processor.addRootPage(filename, 'File Tree', 'contents', 2)
+ filename = self.processor.file_layout.special('FileTree')
+ self.processor.add_root_page(filename, 'File Tree', 'contents', 2)
def filename(self):
"""since FileTree generates a whole file hierarchy, this method returns the current filename,
@@ -46,14 +46,14 @@ class FileTree(JSTree):
os.path.join(share, 'syn-dot.png'),
'tree_%s.png', 0)
# Start the file
- filename = self.processor.file_layout.nameOfSpecial('FileTree')
+ filename = self.processor.file_layout.special('FileTree')
self.start_file(filename, 'File Tree')
- self.write(self.processor.formatHeader(filename, 2))
+ self.write(self.processor.navigation_bar(filename, 2))
# recursively visit all nodes
- self.processFileTreeNode(self.processor.fileTree.root())
+ self.process_file_tree_node(self.processor.fileTree.root())
self.end_file()
# recursively create all node pages
- self.processFileTreeNodePage(self.processor.fileTree.root())
+ self.process_file_tree_node_page(self.processor.file_tree.root())
def _node_sorter(self, a, b):
a_leaf = hasattr(a, 'decls')
@@ -62,12 +62,12 @@ class FileTree(JSTree):
return cmp(b_leaf, a_leaf)
return cmp(string.upper(a.path[-1]), string.upper(b.path[-1]))
- def processFileTreeNode(self, node):
+ def process_file_tree_node(self, node):
if hasattr(node, 'decls'):
# Leaf node
- text = href(self.processor.file_layout.nameOfFileIndex(string.join(node.path,
- os.sep)),
+ text = href(self.processor.file_layout.file_index(string.join(node.path,
+ os.sep)),
node.path[-1], target='index')
self.writeLeaf(text)
return
@@ -79,20 +79,20 @@ class FileTree(JSTree):
if len(children):
for child in children:
#self.write('<div class="files">')
- self.processFileTreeNode(child)
+ self.process_file_tree_node(child)
#self.write('</div>')
if len(node.path):
- self.writeNodeEnd()
+ self.write_node_end()
- def processFileTreeNodePage(self, node):
+ def process_file_tree_node_page(self, node):
for child in node.children.values():
- self.processFileTreeNodePage(child)
+ self.process_file_tree_node_page(child)
if not hasattr(node, 'decls'): return
# set up filename and title for the current page
- self.__filename = self.processor.file_layout.nameOfFileIndex(string.join(node.path,
- os.sep))
+ self.__filename = self.processor.file_layout.file_index(string.join(node.path,
+ os.sep))
name = list(node.path)
while len(name) and name[0] == '..': del name[0]
self.__title = string.join(name, os.sep)
@@ -100,7 +100,7 @@ class FileTree(JSTree):
self.start_file()
self.write(entity('b', string.join(name, os.sep))+'<br>')
if self.link_to_pages:
- link = self.processor.file_layout.nameOfScopedSpecial('page', name)
+ link = self.processor.file_layout.scoped_special('page', name)
self.write(href(link, '[Source]', target="main")+'<br>')
for name, decl in node.decls.items():
# TODO make this nicer :)
Index: FramesIndex.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/FramesIndex.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- FramesIndex.py 15 Nov 2003 19:01:53 -0000 1.11
+++ FramesIndex.py 16 Nov 2003 21:09:45 -0000 1.12
@@ -20,7 +20,7 @@ class FramesIndex(Page):
Page.register(self, processor)
processor.set_main_page(self.filename())
- def filename(self): return self.processor.file_layout.nameOfIndex()
+ def filename(self): return self.processor.file_layout.index()
def title(self): return 'Synopsis - Generated Documentation'
Index: InheritanceGraph.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/InheritanceGraph.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- InheritanceGraph.py 15 Nov 2003 19:01:53 -0000 1.28
+++ InheritanceGraph.py 16 Nov 2003 21:09:45 -0000 1.29
@@ -63,9 +63,9 @@ class InheritanceGraph(Page):
Page.register(self, processor)
self.decl_finder = DeclarationFinder(processor.ast.types(), processor.verbose)
- self.processor.addRootPage(self.filename(), 'Inheritance Graph', 'main', 1)
+ self.processor.add_root_page(self.filename(), 'Inheritance Graph', 'main', 1)
- def filename(self): return self.processor.file_layout.nameOfSpecial('InheritanceGraph')
+ def filename(self): return self.processor.file_layout.special('InheritanceGraph')
def title(self): return 'Synopsis - Class Hierarchy'
def consolidate(self, graphs):
@@ -108,7 +108,7 @@ class InheritanceGraph(Page):
filename = self.filename()
self.start_file()
- self.write(self.processor.formatHeader(filename))
+ self.write(self.processor.navigation_bar(filename))
self.write(entity('h1', "Inheritance Graph"))
try:
@@ -120,7 +120,7 @@ class InheritanceGraph(Page):
# Create a toc file for Dot to use
toc_file = filename + "-dot.toc"
self.processor.toc.store(toc_file)
- graphs = self.processor.classTree.graphs()
+ graphs = self.processor.class_tree.graphs()
count = 0
# Consolidate the graphs, and sort to make the largest appear first
lensorter = lambda a, b: cmp(len(b),len(a))
@@ -141,7 +141,7 @@ class InheritanceGraph(Page):
self.write('Graphs in '+type_str+name+':<br>')
for graph in graphs:
try:
- if core.verbose: print "Creating graph #%s - %s classes"%(count,len(graph))
+ if self.processor.verbose: print "Creating graph #%s - %s classes"%(count,len(graph))
# Find declarations
declarations = map(self.decl_finder, graph)
declarations = filter(lambda x: x is not None, declarations)
Index: InheritanceTree.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/InheritanceTree.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- InheritanceTree.py 15 Nov 2003 19:01:53 -0000 1.14
+++ InheritanceTree.py 16 Nov 2003 21:09:45 -0000 1.15
@@ -19,18 +19,18 @@ class InheritanceTree(Page):
def register(self, processor):
Page.register(self, processor)
- self.processor.addRootPage(self.filename(), 'Inheritance Tree', 'main', 1)
+ self.processor.add_root_page(self.filename(), 'Inheritance Tree', 'main', 1)
- def filename(self): return self.processor.file_layout.nameOfSpecial('InheritanceTree')
+ def filename(self): return self.processor.file_layout.special('InheritanceTree')
def title(self): return 'Synopsis - Class Hierarchy'
def process(self, start):
"""Creates a file with the inheritance tree"""
- roots = self.processor.classTree.roots()
+ roots = self.processor.class_tree.roots()
self.start_file()
- self.write(self.processor.formatHeader(self.filename()))
+ self.write(self.processor.navigation_bar(self.filename()))
self.write(entity('h1', "Inheritance Tree"))
self.write('<ul>')
map(self.process_class_inheritance, map(lambda a,b=start.name():(a,b), roots))
@@ -41,10 +41,10 @@ class InheritanceTree(Page):
name, rel_name = args
self.write('<li>')
self.write(self.reference(name, rel_name))
- parents = self.processor.classTree.superclasses(name)
+ parents = self.processor.class_tree.superclasses(name)
if parents:
self.write(' <i>(%s)</i>'%string.join(map(Util.ccolonName, parents), ", "))
- subs = self.processor.classTree.subclasses(name)
+ subs = self.processor.class_tree.subclasses(name)
if subs:
self.write('<ul>')
map(self.process_class_inheritance, map(lambda a,b=name:(a,b), subs))
Index: JSTree.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/JSTree.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- JSTree.py 15 Nov 2003 19:01:53 -0000 1.7
+++ JSTree.py 16 Nov 2003 21:09:45 -0000 1.8
@@ -8,8 +8,8 @@
#
from Synopsis.Processor import Parameter
-from Synopsis.Formatter.HTML.Page import Page
-from Synopsis.Formatter.HTML.Tags import *
+from Synopsis.Formatters.HTML.Page import Page
+from Synopsis.Formatters.HTML.Tags import *
#The javascript that goes up the top
top_js = """<script language="JavaScript1.2"><!--
@@ -100,9 +100,9 @@ class JSTree(Page):
self.__base_close = base%'close'
self.__base_leaf = base%'leaf'
# Copy images across
- self.processor.file_layout.copyFile(open_img, self.__base_open)
- self.processor.file_layout.copyFile(close_img, self.__base_close)
- self.processor.file_layout.copyFile(leaf_img, self.__base_leaf)
+ self.processor.file_layout.copy_file(open_img, self.__base_open)
+ self.processor.file_layout.copy_file(close_img, self.__base_close)
+ self.processor.file_layout.copy_file(leaf_img, self.__base_leaf)
def start_file(self):
"""Overrides start_file to add the javascript"""
Index: ModuleIndexer.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/ModuleIndexer.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -d -r1.17 -r1.18
--- ModuleIndexer.py 15 Nov 2003 19:01:53 -0000 1.17
+++ ModuleIndexer.py 16 Nov 2003 21:09:45 -0000 1.18
@@ -24,7 +24,7 @@ class ModuleIndexer(Page):
Page.register(self, processor)
processor.set_using_module_index()
- self.__filename = self.processor.file_layout.nameOfModuleIndex(())
+ self.__filename = self.processor.file_layout.module_index(())
processor.set_index_page(self.__filename)
def filename(self): return self.__filename
@@ -34,12 +34,12 @@ class ModuleIndexer(Page):
def process(self, start):
"""Creates indexes for all modules"""
- start_file = self.processor.file_layout.nameOfModuleIndex(start.name())
+ start_file = self.processor.file_layout.module_index(start.name())
self.processor.set_index_page(start_file)
self.__namespaces = [start]
while self.__namespaces:
ns = self.__namespaces.pop(0)
- self.processNamespaceIndex(ns)
+ self.process_namespace_index(ns)
def _makePageHeading(self, ns):
"""Creates a HTML fragment which becomes the name at the top of the
@@ -51,12 +51,12 @@ class ModuleIndexer(Page):
if not name: return 'Global Index'
links = []
for depth in range(0, len(name)):
- url = self.processor.file_layout.nameOfModuleIndex(name[:depth+1])
+ url = self.processor.file_layout.module_index(name[:depth+1])
label = anglebrackets(name[depth])
links.append(href(rel(self.__filename, url), label))
return entity('b', string.join(links, '\n::') + ' Index')
- def processNamespaceIndex(self, ns):
+ def process_namespace_index(self, ns):
"Index one module"
sorter = self.processor.sorter
@@ -64,12 +64,12 @@ class ModuleIndexer(Page):
sorter.sort_section_names()
sorter.sort_sections()
- self.__filename = self.processor.file_layout.nameOfModuleIndex(ns.name())
+ self.__filename = self.processor.file_layout.module_index(ns.name())
self.__title = Util.ccolonName(ns.name()) or 'Global Namespace'
self.__title = self.__title + ' Index'
# Create file
self.start_file()
- #target = rel(self.__filename, self.processor.file_layout.nameOfScope(ns.name()))
+ #target = rel(self.__filename, self.processor.file_layout.scope(ns.name()))
#link = href(target, self.__title, target='main')
self.write(self._makePageHeading(ns))
@@ -104,7 +104,7 @@ class ModuleIndexer(Page):
label = replace_spaces(label)
if isinstance(child, AST.Module):
index_url = rel(self.__filename,
- self.processor.file_layout.nameOfModuleIndex(child.name()))
+ self.processor.file_layout.module_index(child.name()))
self.write(href(index_url, label, target='index'))
else:
entry = toc[child.name()]
Index: ModuleListing.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/ModuleListing.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- ModuleListing.py 15 Nov 2003 19:01:53 -0000 1.15
+++ ModuleListing.py 16 Nov 2003 21:09:45 -0000 1.16
@@ -26,10 +26,10 @@ class ModuleListing(Page):
self._children_cache = {}
filename = self.filename()
processor.set_contents_page(filename)
- self.processor.addRootPage(filename, self.short_title, 'contents', 2)
+ self.processor.add_root_page(filename, self.short_title, 'contents', 2)
self._link_target = 'index'
- def filename(self): return self.processor.file_layout.nameOfSpecial('ModuleListing')
+ def filename(self): return self.processor.file_layout.special('ModuleListing')
def title(self): return self.short_title + ' Listing'
@@ -40,7 +40,7 @@ class ModuleListing(Page):
self.tree.register(self)
# Create the file
self.start_file()
- self.write(self.processor.formatHeader(self.filename(), 2))
+ self.write(self.processor.navigation_bar(self.filename(), 2))
self.tree.start_tree()
self.indexModule(start, start.name())
self.tree.end_tree()
@@ -58,7 +58,7 @@ class ModuleListing(Page):
"""Returns the link to the given declaration"""
return rel(self.filename(),
- self.processor.file_layout.nameOfModuleIndex(ns.name()))
+ self.processor.file_layout.module_index(ns.name()))
def _get_children(self, decl):
"""Returns the children of the given declaration"""
Index: ModuleListingJS.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/ModuleListingJS.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- ModuleListingJS.py 15 Nov 2003 19:01:53 -0000 1.13
+++ ModuleListingJS.py 16 Nov 2003 21:09:45 -0000 1.14
@@ -27,12 +27,12 @@ class ModuleListingJS(JSTree):
def _init_page(self):
"Sets _filename and registers the page with the manager"
- filename = self.processor.file_layout.nameOfSpecial('ModuleTree')
+ filename = self.processor.file_layout.special('ModuleTree')
self.processor.set_contents_page(filename)
- self.manager.addRootPage(filename, 'Modules', 'contents', 2)
+ self.processor.add_root_page(filename, 'Modules', 'contents', 2)
self._link_target = 'index'
- def filename(self): return self.processor.file_layout.nameOfSpecial('ModuleTree')
+ def filename(self): return self.processor.file_layout.special('ModuleTree')
def title(self): return 'Module Tree'
def process(self, start):
@@ -46,7 +46,7 @@ class ModuleListingJS(JSTree):
self.__share = share
# Creare the file
self.start_file()
- self.write(self.manager.formatHeader(filename, 2))
+ self.write(self.processor.navigation_bar(self.filename(), 2))
self.indexModule(start, start.name())
self.end_file()
@@ -56,7 +56,7 @@ class ModuleListingJS(JSTree):
def _link_href(self, ns):
- return self.processor.file_layout.nameOfModuleIndex(ns.name())
+ return self.processor.file_layout.module_index(ns.name())
def get_children(self, decl):
Index: NameIndex.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/NameIndex.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- NameIndex.py 15 Nov 2003 19:01:53 -0000 1.14
+++ NameIndex.py 16 Nov 2003 21:09:45 -0000 1.15
@@ -23,9 +23,9 @@ class NameIndex(Page):
def register(self, processor):
Page.register(self, processor)
- self.processor.addRootPage(self.filename(), 'Name Index', 'main', 1)
+ self.processor.add_root_page(self.filename(), 'Name Index', 'main', 1)
- def filename(self): return self.processor.file_layout.nameOfSpecial('NameIndex')
+ def filename(self): return self.processor.file_layout.special('NameIndex')
def title(self): return 'Synopsis - Name Index'
@@ -35,7 +35,7 @@ class NameIndex(Page):
_processItem is called for each item in the dictionary."""
self.start_file()
- self.write(self.processor.formatHeader(self.filename()))
+ self.write(self.processor.navigation_bar(self.filename()))
self.write(entity('h1', "Name Index"))
self.write('<i>Hold the mouse over a link to see the scope of each name</i>')
@@ -57,7 +57,7 @@ class NameIndex(Page):
end = numitems * (column + 1) / self.columns
self.write('<td valign=top>')
for item in items[start:end]:
- self._processItem(item)
+ self._process_item(item)
self.write('</td>')
start = end
self.write('</tr></table>')
@@ -92,7 +92,7 @@ class NameIndex(Page):
items.sort(name_cmp)
return dict
- def _processItem(self, type):
+ def _process_item(self, type):
"""Process the given name for output"""
name = type.name()
Index: RawFile.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/RawFile.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- RawFile.py 15 Nov 2003 19:51:42 -0000 1.11
+++ RawFile.py 16 Nov 2003 21:09:45 -0000 1.12
@@ -58,7 +58,7 @@ class RawFile(Page):
#if stat.S_ISDIR(info[stat.ST_MODE]):
# dirs.append(entry_path)
#else:
- # filename = self.processor.file_layout.nameOfFileSource(entry_path)
+ # filename = self.processor.file_layout.file_source(entry_path)
# self.__files.append( (entry_path, filename) )
pass
return self.__files
@@ -85,7 +85,7 @@ class RawFile(Page):
self.__filename = filename
self.__title = original
self.start_file()
- self.write(self.processor.formatHeader(filename, 2))
+ self.write(self.processor.navigation_bar(filename, 2))
self.write('<h1>'+original+'</h1>')
try:
f = open(original, 'rt')
Index: Scope.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/Scope.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -d -r1.25 -r1.26
--- Scope.py 16 Nov 2003 01:45:27 -0000 1.25
+++ Scope.py 16 Nov 2003 21:09:45 -0000 1.26
@@ -27,6 +27,7 @@ class Scope(Page):
parts = Parameter([Heading(),
Summary(),
+ Inheritance(),
Detail()],
'')
@@ -35,8 +36,8 @@ class Scope(Page):
Page.register(self, processor)
share = config.datadir
self.syn_logo = 'synopsis200.jpg'
- self.processor.file_layout.copyFile(os.path.join(share, 'synopsis200.jpg'),
- os.path.join(processor.output, self.syn_logo))
+ processor.file_layout.copy_file(os.path.join(share, 'synopsis200.jpg'),
+ self.syn_logo)
for part in self.parts: part.register(self)
@@ -77,7 +78,7 @@ class Scope(Page):
self.process_scope(ns)
# Queue child namespaces
- for child in config.sorter.children():
+ for child in self.processor.sorter.children():
if isinstance(child, AST.Scope):
self.__namespaces.append(child)
@@ -88,13 +89,13 @@ class Scope(Page):
while self.__namespaces:
ns = self.__namespaces.pop(0)
- filename = self.processor.file_layout.nameOfScope(ns.name())
+ filename = self.processor.file_layout.scope(ns.name())
self.processor.register_filename(filename, self, ns)
- config.sorter.set_scope(ns)
+ self.processor.sorter.set_scope(ns)
# Queue child namespaces
- for child in config.sorter.children():
+ for child in self.processor.sorter.children():
if isinstance(child, AST.Scope):
self.__namespaces.append(child)
@@ -106,15 +107,15 @@ class Scope(Page):
# Open file and setup scopes
self.__scope = ns.name()
- self.__filename = self.processor.file_layout.nameOfScope(self.__scope)
+ self.__filename = self.processor.file_layout.scope(self.__scope)
self.__title = anglebrackets(string.join(self.__scope))
self.start_file()
# Write heading
- self.write(self.processor.formatHeader(self.filename()))
+ self.write(self.processor.navigation_bar(self.filename()))
# Loop throught all the page Parts
- for part in self.__parts:
+ for part in self.parts:
part.process(ns)
self.end_file()
Index: XRef.py
===================================================================
RCS file: /cvs/synopsis/Synopsis/Synopsis/Formatters/HTML/Pages/XRef.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- XRef.py 16 Nov 2003 01:45:27 -0000 1.15
+++ XRef.py 16 Nov 2003 21:09:45 -0000 1.16
@@ -51,7 +51,7 @@ class XRef(Page):
xref = self.processor.xref
for name in xref.get_all_names():
page = xref.get_page_for(name)
- file = self.processor.file_layout.nameOfSpecial('xref%d'%page)
+ file = self.processor.file_layout.special('xref%d'%page)
file = file + '#' + Util.quote(string.join(name,'::'))
self.__toc.insert(TOC.Entry(name, file, 'C++', 'xref'))
return self.__toc
@@ -74,11 +74,11 @@ class XRef(Page):
page_info = self.processor.xref.get_page_info()
if not page_info: return
for i in range(len(page_info)):
- self.__filename = self.processor.file_layout.nameOfSpecial('xref%d'%i)
+ self.__filename = self.processor.file_layout.special('xref%d'%i)
self.__title = 'Cross Reference page #%d'%i
self.start_file()
- self.write(self.processor.formatHeader(self.filename()))
+ self.write(self.processor.navigation_bar(self.filename()))
self.write(entity('h1', self.__title))
self.write('<hr>')
for name in page_info[i]:
@@ -91,7 +91,7 @@ class XRef(Page):
page_info = self.processor.xref.get_page_info()
if not page_info: return
for i in range(len(page_info)):
- filename = self.processor.file_layout.nameOfSpecial('xref%d'%i)
+ filename = self.processor.file_layout.special('xref%d'%i)
self.processor.register_filename(filename, self, i)
def process_link(self, file, line, scope):
@@ -99,7 +99,7 @@ class XRef(Page):
# Make a link to the highlighted source
realfile = os.path.join(config.base_dir, file)
- file_link = self.processor.file_layout.nameOfFileSource(realfile)
+ file_link = self.processor.file_layout.file_source(realfile)
file_link = file_link + "#%d"%line
# Try and make a descriptive
desc = ''
@@ -171,7 +171,7 @@ class XRef(Page):
for child in decl.declarations():
file, line = child.file().filename(), child.line()
realfile = os.path.join(config.base_dir, file)
- file_link = self.processor.file_layout.nameOfFileSource(realfile)
+ file_link = self.processor.file_layout.file_source(realfile)
file_link = '%s#%d'%(file_link,line)
file_href = '<a href="%s">%s:%s</a>: '%(file_link,file,line)
cname = child.name()
- Previous message: [Synopsis-changes] Synopsis/Synopsis/Synopsis Config.py,1.24,NONE
- Next message: [Synopsis-changes] Synopsis/Synopsis/Synopsis/Formatters/HTML/Parts Detail.py,1.1,1.2 Heading.py,1.2,1.3 Inheritance.py,1.2,1.3 Summary.py,1.2,1.3
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Synopsis-changes mailing list