diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2015-03-10 15:11:37 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2015-03-10 15:11:37 +0000 |
| commit | 7aa6dc8056241fee2eb06e26d7fdbabf60973dde (patch) | |
| tree | fb2a91035d368f6f6b51c38549d9a99dce4892e0 | |
| parent | 214dab031c19b50c6cb493481bdea7262283debb (diff) | |
| download | docutils-7aa6dc8056241fee2eb06e26d7fdbabf60973dde.tar.gz | |
Fix setup.py and tests after addition of writers/html_base and mv of math.css.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7817 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
| -rw-r--r-- | docutils/docutils/writers/__init__.py | 1 | ||||
| -rw-r--r-- | docutils/docutils/writers/html4css1/__init__.py | 7 | ||||
| -rwxr-xr-x | docutils/setup.py | 7 | ||||
| -rwxr-xr-x | docutils/test/test_writers/test_html4css1_misc.py | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/docutils/docutils/writers/__init__.py b/docutils/docutils/writers/__init__.py index 181678a34..4a7a19fd0 100644 --- a/docutils/docutils/writers/__init__.py +++ b/docutils/docutils/writers/__init__.py @@ -121,6 +121,7 @@ class UnfilteredWriter(Writer): _writer_aliases = { 'html': 'html4css1', + 'html-base': 'html_base', 'xhtml': 'xhtml11', 'latex': 'latex2e', 'xelatex': 'xetex', diff --git a/docutils/docutils/writers/html4css1/__init__.py b/docutils/docutils/writers/html4css1/__init__.py index e031367b3..9a48e425c 100644 --- a/docutils/docutils/writers/html4css1/__init__.py +++ b/docutils/docutils/writers/html4css1/__init__.py @@ -43,7 +43,12 @@ class Writer(writers.Writer): """Formats this writer supports.""" default_stylesheets = ['html4css1.css'] - default_stylesheet_dirs = ['.', os.path.abspath(os.path.dirname(__file__))] + default_stylesheet_dirs = ['.', + os.path.abspath(os.path.dirname(__file__)), + # for math.css + os.path.abspath(os.path.join( + os.path.dirname(os.path.dirname(__file__)), 'html_base')) + ] default_template = 'template.txt' default_template_path = os.path.join( diff --git a/docutils/setup.py b/docutils/setup.py index f0e08c14a..e0f9f3f2f 100755 --- a/docutils/setup.py +++ b/docutils/setup.py @@ -135,6 +135,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'docutils.utils.math', 'docutils.writers', 'docutils.writers.html4css1', + 'docutils.writers.html_base', 'docutils.writers.xhtml11', 'docutils.writers.pep_html', 'docutils.writers.s5_html', @@ -145,9 +146,12 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 ], 'data_files': ([('docutils/parsers/rst/include', glob.glob('docutils/parsers/rst/include/*.txt')), + ('docutils/writers/html_base', + ['docutils/writers/html_base/html-base.css', + 'docutils/writers/html_base/math.css', + 'docutils/writers/html_base/template.txt']), ('docutils/writers/html4css1', ['docutils/writers/html4css1/html4css1.css', - 'docutils/writers/html4css1/math.css', 'docutils/writers/html4css1/template.txt']), ('docutils/writers/latex2e', ['docutils/writers/latex2e/default.tex', @@ -165,6 +169,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 ] + s5_theme_files), 'scripts' : ['tools/rst2html.py', + 'tools/rst2html5.py', 'tools/rst2s5.py', 'tools/rst2latex.py', 'tools/rst2xetex.py', diff --git a/docutils/test/test_writers/test_html4css1_misc.py b/docutils/test/test_writers/test_html4css1_misc.py index 7a3dc0dea..7bcb8d73b 100755 --- a/docutils/test/test_writers/test_html4css1_misc.py +++ b/docutils/test/test_writers/test_html4css1_misc.py @@ -100,7 +100,7 @@ class SettingsTestCase(DocutilsTestSupport.StandardTestCase): styles = core.publish_parts(self.data, writer_name='html4css1', settings_overrides=mysettings)['stylesheet'] self.assertIn('docutils/writers/html4css1/html4css1.css', styles) - self.assertIn('docutils/writers/html4css1/math.css', styles) + self.assertIn('docutils/writers/html_base/math.css', styles) def test_custom_stylesheet_linked(self): # default + custom style sheet, linked |