diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2008-12-09 14:23:21 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2008-12-09 14:23:21 +0000 |
| commit | efb646e15cebfea78a8d1405f43e893aee7b65a2 (patch) | |
| tree | a46b1837f058028263641057ba68087fabe117c9 | |
| parent | efeb77918c4c49bac380bd255f4b4da9df846362 (diff) | |
| download | docutils-efb646e15cebfea78a8d1405f43e893aee7b65a2.tar.gz | |
utils.py: let DependencyList.add() accept multiple file arguments,
html4css1/__init__.py: use this to register the list of stylesheets
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@5812 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
| -rw-r--r-- | docutils/docutils/utils.py | 13 | ||||
| -rw-r--r-- | docutils/docutils/writers/html4css1/__init__.py | 15 |
2 files changed, 14 insertions, 14 deletions
diff --git a/docutils/docutils/utils.py b/docutils/docutils/utils.py index 5079c2c54..4b35ec5d4 100644 --- a/docutils/docutils/utils.py +++ b/docutils/docutils/utils.py @@ -585,17 +585,18 @@ class DependencyList: 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. diff --git a/docutils/docutils/writers/html4css1/__init__.py b/docutils/docutils/writers/html4css1/__init__.py index 7b623ee1e..67582f27c 100644 --- a/docutils/docutils/writers/html4css1/__init__.py +++ b/docutils/docutils/writers/html4css1/__init__.py @@ -256,16 +256,15 @@ class HTMLTranslator(nodes.NodeVisitor): 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 |