summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-09-05 12:54:56 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-09-05 12:54:56 +0000
commitd995b9ad6419adab456e678b401ff42433c21ea5 (patch)
treed96f2d6a3dafeb4a0dd2c78ce79db359cd23d4fa
parent288374b7827b7dd3b609cfbea579188f6e9d5ee1 (diff)
downloaddocutils-d995b9ad6419adab456e678b401ff42433c21ea5.tar.gz
Fix math header writing for S5 (thanks to Jose Rojas for reporting).
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7720 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/writers/s5_html/__init__.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/docutils/writers/s5_html/__init__.py b/docutils/writers/s5_html/__init__.py
index 6ac0fd4e3..2f7f024c9 100644
--- a/docutils/writers/s5_html/__init__.py
+++ b/docutils/writers/s5_html/__init__.py
@@ -286,24 +286,28 @@ class S5HTMLTranslator(html4css1.HTMLTranslator):
self.meta.insert(0, self.content_type % self.settings.output_encoding)
self.head.insert(0, self.content_type % self.settings.output_encoding)
if self.math_header:
- self.head.append(self.math_header)
-
+ if self.math_output == 'mathjax':
+ self.head.extend(self.math_header)
+ else:
+ self.stylesheet.extend(self.math_header)
+ # skip content-type meta tag with interpolated charset value:
+ self.html_head.extend(self.head[1:])
+ self.fragment.extend(self.body)
+ # special S5 code up to the next comment line
header = ''.join(self.s5_header)
footer = ''.join(self.s5_footer)
title = ''.join(self.html_title).replace('<h1 class="title">', '<h1>')
layout = self.layout_template % {'header': header,
'title': title,
'footer': footer}
- self.fragment.extend(self.body)
self.body_prefix.extend(layout)
self.body_prefix.append('<div class="presentation">\n')
self.body_prefix.append(
self.starttag({'classes': ['slide'], 'ids': ['slide0']}, 'div'))
if not self.section_count:
self.body.append('</div>\n')
+ #
self.body_suffix.insert(0, '</div>\n')
- # skip content-type meta tag with interpolated charset value:
- self.html_head.extend(self.head[1:])
self.html_body.extend(self.body_prefix[1:] + self.body_pre_docinfo
+ self.docinfo + self.body
+ self.body_suffix[:-1])