From: Felix W. <fel...@us...> - 2004-09-19 18:59:21
|
Update of /cvsroot/docutils/docutils/docutils/writers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9333/docutils/writers Modified Files: html4css1.py latex2e.py Log Message: making stylesheet and stylesheet_path mutually exclusive was a bad idea; reverted Index: latex2e.py =================================================================== RCS file: /cvsroot/docutils/docutils/docutils/writers/latex2e.py,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- latex2e.py 19 Sep 2004 18:39:39 -0000 1.139 +++ latex2e.py 19 Sep 2004 18:59:11 -0000 1.140 @@ -704,8 +704,6 @@ def get_stylesheet_reference(self, relative_to=None): settings = self.settings if settings.stylesheet_path: - assert not settings.stylesheet, \ - 'stylesheet and stylesheet_path are mutually exclusive.' if relative_to == None: relative_to = settings._destination return utils.relative_path(relative_to, settings.stylesheet_path) Index: html4css1.py =================================================================== RCS file: /cvsroot/docutils/docutils/docutils/writers/html4css1.py,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- html4css1.py 19 Sep 2004 18:38:37 -0000 1.117 +++ html4css1.py 19 Sep 2004 18:59:11 -0000 1.118 @@ -228,8 +228,6 @@ def get_stylesheet_reference(self, relative_to=None): settings = self.settings if settings.stylesheet_path: - assert not settings.stylesheet, \ - 'stylesheet and stylesheet_path are mutually exclusive.' if relative_to == None: relative_to = settings._destination return utils.relative_path(relative_to, settings.stylesheet_path) |