From: <mi...@us...> - 2008-12-09 14:23:36
|
Author: milde Date: 2008-12-09 15:23:21 +0100 (Tue, 09 Dec 2008) New Revision: 5812 Modified: trunk/docutils/docutils/utils.py trunk/docutils/docutils/writers/html4css1/__init__.py Log: utils.py: let DependencyList.add() accept multiple file arguments, html4css1/__init__.py: use this to register the list of stylesheets Modified: trunk/docutils/docutils/utils.py =================================================================== --- trunk/docutils/docutils/utils.py 2008-12-09 14:20:11 UTC (rev 5811) +++ trunk/docutils/docutils/utils.py 2008-12-09 14:23:21 UTC (rev 5812) @@ -585,17 +585,18 @@ else: self.file = None - def add(self, filename): + def add(self, *filenames): """ If the dependency `filename` has not already been added, append it to self.list and print it to self.file if self.file is not None. """ - if not filename in self.list: - self.list.append(filename) - if self.file is not None: - print >>self.file, filename - + for filename in filenames: + if not filename in self.list: + self.list.append(filename) + if self.file is not None: + print >>self.file, filename + def close(self): """ Close the output file. Modified: trunk/docutils/docutils/writers/html4css1/__init__.py =================================================================== --- trunk/docutils/docutils/writers/html4css1/__init__.py 2008-12-09 14:20:11 UTC (rev 5811) +++ trunk/docutils/docutils/writers/html4css1/__init__.py 2008-12-09 14:23:21 UTC (rev 5812) @@ -256,16 +256,15 @@ if settings.embed_stylesheet: stylelib = os.path.join(os.getcwd(), 'dummy') - sheets = utils.get_stylesheet_reference_list(settings, stylelib) - self.stylesheet = [] - for stylesheet in sheets: - settings.record_dependencies.add(stylesheet) - self.stylesheet.append(self.embedded_stylesheet - % open(stylesheet).read()) + styles = utils.get_stylesheet_reference_list(settings, stylelib) + settings.record_dependencies.add(*styles) + self.stylesheet = [self.embedded_stylesheet + % open(stylesheet).read() + for stylesheet in styles] else: - sheets = utils.get_stylesheet_reference_list(settings) + styles = utils.get_stylesheet_reference_list(settings) self.stylesheet = [self.stylesheet_link % self.encode(stylesheet) - for stylesheet in sheets] + for stylesheet in styles] self.body_prefix = ['</head>\n<body>\n'] # document title, subtitle display |